Migrate to GitHub Actions

Author: const-cloudinary

.github/workflows/ci.yml

@@ -0,0 +1,42 @@
+name: CI
+
+on: [push, pull_request]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        scala-version: ['2.11.8', '2.12.8']
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set up JDK 8 with SBT cache
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: '8'
+          cache: 'sbt'
+
+      - name: Install SBT and jq
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y apt-transport-https curl gnupg jq
+          echo "deb https://repo.scala-sbt.org/scalasbt/debian all main" | sudo tee /etc/apt/sources.list.d/sbt.list
+          curl -sL "https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x2EE0EA64E40A89B84B2DF73499E82A75642AC823" | sudo apt-key add
+          sudo apt-get update
+          sudo apt-get install -y sbt
+
+      - name: Set CLOUDINARY_URL
+        run: |
+          export CLOUDINARY_URL=$(bash tools/get_test_cloud.sh)
+          echo "cloud_name: $(echo $CLOUDINARY_URL | cut -d'@' -f2)"
+          echo "CLOUDINARY_URL=$CLOUDINARY_URL" >> $GITHUB_ENV
+
+      - name: Run tests
+        run: sbt ++${{ matrix.scala-version }} test
+        env:
+          CLOUDINARY_URL: ${{ env.CLOUDINARY_URL }}

.travis.yml

@@ -1,23 +1,23 @@
-[![Build Status](https://travis-ci.org/cloudinary/cloudinary_scala.svg)](https://travis-ci.org/cloudinary/cloudinary_scala)
+[![Build Status](https://github.com/cloudinary/cloudinary_scala/actions/workflows/ci.yml/badge.svg)](https://github.com/cloudinary/cloudinary_scala/actions)
 
 > The Scala SDK is **deprecated** and is no longer maintained, with the exception of any high-priority regression bugs that may arise.
-> 
+>
 > We recommend that you use one of Cloudinary's many active and fully supported SDKs. For details and complete documentation on all available
 [GitHub](https://github.com/search?o=desc&q=topic%3Acloudinary-sdk+org%3Acloudinary+fork%3Atrue&s=stars&type=Repositories), see our [Cloudinary SDK Guides](https://cloudinary.com/documentation/cloudinary_sdks).
 
 
 Cloudinary
 ==========
 
-Cloudinary is a cloud service that offers a solution to a web application's entire image management pipeline. 
+Cloudinary is a cloud service that offers a solution to a web application's entire image management pipeline.
 
-Easily upload images to the cloud. Automatically perform smart image resizing, cropping and conversion without installing any complex software. 
-Integrate Facebook or Twitter profile image extraction in a snap, in any dimension and style to match your website’s graphics requirements. 
-Images are seamlessly delivered through a fast CDN, and much much more. 
+Easily upload images to the cloud. Automatically perform smart image resizing, cropping and conversion without installing any complex software.
+Integrate Facebook or Twitter profile image extraction in a snap, in any dimension and style to match your website’s graphics requirements.
+Images are seamlessly delivered through a fast CDN, and much much more.
 
 Cloudinary offers comprehensive APIs and administration capabilities and is easy to integrate with any web application, existing or new.
 
-Cloudinary provides URL and HTTP based APIs that can be easily integrated with any Web development framework. 
+Cloudinary provides URL and HTTP based APIs that can be easily integrated with any Web development framework.
 
 For Scala, Cloudinary provides a library for simplifying the integration even further. A Scala Play plugin is provided as well.
 
@@ -28,9 +28,9 @@ For Scala, Cloudinary provides a library for simplifying the integration even fu
 The Play 2.4 branch is not currently published to a Maven repository. To use it in your project you can run `sbt publishLocal`.
 
 To use it, add the following dependency to your `build.sbt`:
-    
+
     resolvers += Resolver.file("Local Ivy", file(Path.userHome + "/.ivy2/local"))(Resolver.ivyStylePatterns)
-    
+
     libraryDependencies += "com.cloudinary" %% "cloudinary-core-scala" % "2.0.0"
 
 If using the [Play 2.4](http://www.playframework.com/) you can add:
@@ -41,7 +41,7 @@ In your controller inject an instance of `CloudinaryResourceBuilder` and make su
 
 ```scala
 class PhotosController @Inject() (cloudinaryResourceBuilder: CloudinaryResourceBuilder) extends Controller {
-  
+
   implicit val cld:com.cloudinary.Cloudinary = cloudinaryResourceBuilder.cld
   import cloudinaryResourceBuilder.preloadedFormatter
   ..
@@ -53,15 +53,15 @@ To use it in a view or to use one of the included view helpers have your Twirl v
 ```
 @(implicit cld:com.cloudinary.Cloudinary)
 ...
-<img src="@url("officialchucknorrispage", Set('format -> "png", 'type -> "facebook", 
+<img src="@url("officialchucknorrispage", Set('format -> "png", 'type -> "facebook",
     'transformation -> Transformation().h_(95).w_(95).c_("thumb").g_("face").e_("sepia").r_(20)./.a_(10)))">
 ```
 
 ## Try it right away
 
 Sign up for a [free account](https://cloudinary.com/users/register/free) so you can try out image transformations and seamless image delivery through CDN.
 
-*Note: Replace `demo` in all the following examples with your Cloudinary's `cloud name`.*  
+*Note: Replace `demo` in all the following examples with your Cloudinary's `cloud name`.*
 
 Accessing an uploaded image with the `sample` public ID through a CDN:
 
@@ -75,7 +75,7 @@ Generating a 150x100 version of the `sample` image and downloading it through a
 
 ![Sample 150x100](https://res.cloudinary.com/demo/image/upload/w_150,h_100,c_fill/sample.jpg "Sample 150x100")
 
-Converting to a 150x100 PNG with rounded corners of 20 pixels: 
+Converting to a 150x100 PNG with rounded corners of 20 pixels:
 
     http://res.cloudinary.com/demo/image/upload/w_150,h_100,c_fill,r_20/sample.png
 
@@ -84,12 +84,12 @@ Converting to a 150x100 PNG with rounded corners of 20 pixels:
 For plenty more transformation options, see our [image transformations documentation](http://cloudinary.com/documentation/image_transformations).
 
 Generating a 120x90 thumbnail based on automatic face detection of the Facebook profile picture of Bill Clinton:
- 
+
     http://res.cloudinary.com/demo/image/facebook/c_thumb,g_face,h_90,w_120/billclinton.jpg
-    
+
 ![Facebook 90x120](https://res.cloudinary.com/demo/image/facebook/c_thumb,g_face,h_90,w_120/billclinton.jpg "Facebook 90x200")
 
-For more details, see our documentation for embedding [Facebook](http://cloudinary.com/documentation/facebook_profile_pictures) and [Twitter](http://cloudinary.com/documentation/twitter_profile_pictures) profile pictures. 
+For more details, see our documentation for embedding [Facebook](http://cloudinary.com/documentation/facebook_profile_pictures) and [Twitter](http://cloudinary.com/documentation/twitter_profile_pictures) profile pictures.
 
 
 ## Usage
@@ -98,14 +98,14 @@ For more details, see our documentation for embedding [Facebook](http://cloudina
 
 #### When using the client library directly
 
-Each request for building a URL of a remote cloud resource must have the `cloud_name` parameter set. 
-Each request to our secure APIs (e.g., image uploads, eager sprite generation) must have the `api_key` and `api_secret` parameters set. 
+Each request for building a URL of a remote cloud resource must have the `cloud_name` parameter set.
+Each request to our secure APIs (e.g., image uploads, eager sprite generation) must have the `api_key` and `api_secret` parameters set.
 See [API, URLs and access identifiers](http://cloudinary.com/documentation/api_and_access_identifiers) for more details.
 
-Setting the `cloud_name`, `api_key` and `api_secret` parameters can be done either directly in each call to a Cloudinary method, 
+Setting the `cloud_name`, `api_key` and `api_secret` parameters can be done either directly in each call to a Cloudinary method,
 by initializing the Cloudinary object, or by using the CLOUDINARY_URL environment variable / system property.
 
-The entry point of the library is the Cloudinary object. 
+The entry point of the library is the Cloudinary object.
 
 ```scala
 val cloudinary = new Cloudinary()
@@ -149,16 +149,16 @@ cloudinary.url().transformation(Transformation().width(100).height(150).
                  generate("sample.jpg")
 ```
 
-Another example, emedding a smaller version of an uploaded image while generating a 90x90 face detection based thumbnail (note the shorter syntax): 
+Another example, emedding a smaller version of an uploaded image while generating a 90x90 face detection based thumbnail (note the shorter syntax):
 
 ```scala
 cloudinary.url().transformation(Transformation().w_(90).h_(90).
                                 c_("thumb").g_("face")).
                  generate("woman.jpg")
 ```
 
-You can provide either a Facebook name or a numeric ID of a Facebook profile or a fan page.  
-             
+You can provide either a Facebook name or a numeric ID of a Facebook profile or a fan page.
+
 Embedding a Facebook profile to match your graphic design is very simple:
 
 ```scala
@@ -167,7 +167,7 @@ cloudinary.url().type("facebook").
                                 crop("fill").gravity("north_west")).
                  generate("billclinton.jpg")
 ```
-                           
+
 Same goes for Twitter:
 
 ```scala
@@ -177,9 +177,9 @@ cloudinary.url().type("twitter_name").generate("billclinton.jpg")
 ### Upload
 
 Assuming you have your Cloudinary configuration parameters defined (`cloud_name`, `api_key`, `api_secret`), uploading to Cloudinary is very simple.
-    
-The following example uploads a local JPG to the cloud: 
-    
+
+The following example uploads a local JPG to the cloud:
+
 ```scala
 cloudinary.uploader().upload("my_picture.jpg")
 ```
@@ -189,23 +189,23 @@ The uploaded image is assigned a randomly generated public ID. The image is imme
 ```scala
 cloudinary.url().generate("abcfrmo8zul1mafopawefg.jpg")
 ```
-        
+
     http://res.cloudinary.com/demo/image/upload/abcfrmo8zul1mafopawefg.jpg
 
-You can also specify your own public ID:    
+You can also specify your own public ID:
 
 ```scala
 import com.cloudinary.parameters.UploadParameters
 import com.cloudinary.Implicits._
 
-cloudinary.uploader().upload("http://www.example.com/image.jpg", 
+cloudinary.uploader().upload("http://www.example.com/image.jpg",
                              UploadParameters(publicId = "sample_remote"))
 
 cloudinary.url().generate("sample_remote.jpg")
 ```
 
     http://res.cloudinary.com/demo/image/upload/sample_remote.jpg
-        
+
 ### Play Helpers
 
 Import using:
@@ -219,10 +219,10 @@ Returns the URL to Cloudinary encoding transformation and URL options:
 Usage:
 
     @url("sample", Set('transformation -> Transformation().width(100).height(100).crop("fill"), 'format -> "png"))
-    
+
     # http://res.cloudinary.com/cloud_name/image/upload/c_fill,h_100,w_100/sample.png
 
-  
+
 ## Additional resources ##########################################################
 
 Additional resources are available at:

README.md

@@ -18,7 +18,7 @@ object Api {
   case object POST extends HttpMethod("POST")
   case object PUT extends HttpMethod("PUT")
   case object DELETE extends HttpMethod("DELETE")
-  
+
   abstract class ListDirection(val dir:String)
   case object ASCENDING extends ListDirection("asc")
   case object DESCENDING extends ListDirection("desc")
@@ -205,7 +205,7 @@ class Api(implicit cloudinary: Cloudinary) {
 
   def transformation(t: Transformation, nextCursor: Option[String] = None, maxResults: Option[Int] = None):Future[TransformationResponse] =
     transformationByName(t.generate, nextCursor, maxResults)
-      
+
   def deleteTransformation(transformation: String):Future[TransformationUpdateResponse] = {
     callApi[TransformationUpdateResponse](Api.DELETE, "transformations" :: transformation :: Nil, Map());
   }

cloudinary-core/src/main/scala/com/cloudinary/Api.scala

@@ -82,4 +82,4 @@ object HttpClient {
 
 
 
-}
+}

cloudinary-core/src/main/scala/com/cloudinary/HttpClient.scala

@@ -29,11 +29,11 @@ trait ParamFactory {
   def apply(key:String, value: Any) = param(key, value)
 
   def parameters: Map[String, _]
-  
+
   type Self
   protected def factory: Map[String,_] => Self
   protected def param(key:String, value:Any):Self = factory(parameters + (key -> value))
-  
+
   private def buildEager(transformations: Iterable[Transformation]): String =
     transformations.map {
       transformation: Transformation =>
@@ -74,7 +74,7 @@ trait UploadableResourceParams extends ParamFactory {
   def callback(value:String) = param("callback" , value)
   def format(value:String) = param("format" , value)
   def `type`(value:String) = param("type" , value)
-  def eager(value:List[Transformation]) = param("eager" , Transformations(value))  
+  def eager(value:List[Transformation]) = param("eager" , Transformations(value))
   def notificationUrl(value:String) = param("notification_url" , value)
   def eagerNotificationUrl(value:String) = param("eager_notification_url" , value)
   def proxy(value:String) = param("proxy" , value)
@@ -109,14 +109,10 @@ case class UploadParameters(parameters: Map[String, _] = Map(), signed:Boolean =
   protected val factory = (p: Map[String, _]) => UploadParameters(p, signed)
 }
 
-case class LargeUploadParameters(parameters: Map[String, _] = Map()) extends ParamFactory {
+case class LargeUploadParameters(parameters: Map[String, _] = Map(), signed: Boolean = true) extends UploadableResourceParams with UpdateableResourceParams {
   type Self = LargeUploadParameters
-  protected val factory = LargeUploadParameters.apply _
-  def `type`(value:String) = param("type" , value)
-  def publicId(value:String) = param("public_id" , value)
-  def backup(backup:Boolean) = param("backup" , backup)
+  protected val factory = (p: Map[String, _]) => LargeUploadParameters(p, signed)
   def uploadId(value:String) = param("upload_id" , value)
-  def tags(value:Set[String]) = param("tags" , StringSet(value))
 }
 
 case class TextParameters(text: String,
@@ -168,4 +164,4 @@ object SearchParameters {
     renameTo("nextCursor", "next_cursor") orElse
     renameTo("withField", "with_field") orElse
     renameTo("sortBy", "sort_by"))
-}
+}