Version 3.1.1

Author: mizadi

README.md

@@ -41,14 +41,14 @@ For the complete documentation, see the [Android SDK Guide](https://cloudinary.c
 ### Gradle Integration
 Add the following dependency to your build.gradle:
 
-`implementation 'com.cloudinary:cloudinary-android:3.1.0'`
+`implementation 'com.cloudinary:cloudinary-android:3.1.1'`
 ### Other Options ######################################################################
 The cloudinary_android library is available in [Maven Central](http://repo1.maven.org/maven/). To use it, add the following dependency to your pom.xml:
 
     <dependency>
         <groupId>com.cloudinary</groupId>
         <artifactId>cloudinary-android</artifactId>
-        <version>3.1.0</version>
+        <version>3.1.1</version>
     </dependency>
 
 Download the latest cloudinary-android from [here](https://mvnrepository.com/artifact/com.cloudinary/cloudinary-android-core) and the latest cloudinary-core from [here](https://mvnrepository.com/artifact/com.cloudinary/cloudinary-core) and put them in your libs folder.

core/src/main/java/com/cloudinary/android/MediaManager.java

@@ -39,7 +39,7 @@
  * Must be initialized before use, see {@link #init(Context, SignatureProvider, Map)}.
  */
 public class MediaManager {
-    public static final String VERSION = "3.1.0";
+    public static final String VERSION = "3.1.1";
     public static final String INTENT_EXTRA_REQUEST_ID = "INTENT_EXTRA_REQUEST_ID";
     public static final String INTENT_EXTRA_REQUEST_RESULT_STATUS = "INTENT_EXTRA_REQUEST_RESULT_STATUS";
     public static final String ACTION_REQUEST_STARTED = "com.cloudinary.ACTION_REQUEST_STARTED";

gradle.properties

@@ -13,7 +13,7 @@ [email protected]
 
 # These two properties must use these exact names to be compatible with 'gradle install' plugin.
 group=com.cloudinary
-version=3.1.0
+version=3.1.1
 cloudinaryLibsVersion=2.3.0
 
 org.gradle.jvmargs=-Xmx1024m

publish.gradle

@@ -19,23 +19,6 @@ if (hasProperty("ossrhTokenPassword")) {
             mavenAar(MavenPublication) {
                 from components.android
 
-                artifact("$buildDir/outputs/aar/$jarFileName-release.aar")
-
-                artifact(file("$buildDir/libs/$jarFileName-$version-javadoc.jar.asc")) {
-                    classifier = 'javadoc'
-                    extension = 'jar.asc'
-                }
-
-                artifact(file("$buildDir/libs/$jarFileName-$version-sources.jar.asc")) {
-                    classifier = 'sources'
-                    extension = 'jar.asc'
-                }
-
-                artifact(file("$buildDir/outputs/aar/$jarFileName-release.aar.asc")) {
-                    classifier = null
-                    extension = 'aar.asc'
-                }
-
                 pom {
                     name = publishArtifactName
                     packaging = 'aar'
@@ -63,28 +46,6 @@ if (hasProperty("ossrhTokenPassword")) {
                         url = scmUrl
                     }
                 }
-
-                pom.withXml {
-                    def pomFile = file("${project.buildDir}/generated-pom.xml")
-                    writeTo(pomFile)
-                    def pomAscFile = signing.sign(pomFile).signatureFiles[0]
-                    artifact(pomAscFile) {
-                        classifier = null
-                        extension = 'pom.asc'
-                    }
-                }
-
-                project.tasks.signArchives.signatureFiles.each {
-                    artifact(it) {
-                        def matcher = it.file =~ /-(sources|javadoc)\.jar\.asc$/
-                        if (matcher.find()) {
-                            classifier = matcher.group(1)
-                        } else {
-                            classifier = null
-                        }
-                        extension = 'jar.asc'
-                    }
-                }
             }
         }
 
@@ -96,46 +57,27 @@ if (hasProperty("ossrhTokenPassword")) {
                 }
             }
         }
-
-        model {
-            tasks.generatePomFileForMavenAarPublication {
-                destination = file("$buildDir/generated-pom.xml")
-            }
-            tasks.publishMavenAarPublicationToMavenLocal {
-                dependsOn project.tasks.signArchives
-            }
-            tasks.publishMavenAarPublicationToSonatypeRepository {
-                dependsOn project.tasks.signArchives
-            }
-        }
     }
-}
 
-task signAar(type: Sign) {
-    def aarFile = file("$buildDir/outputs/aar/$jarFileName-release.aar")
-    if (aarFile.exists()) {
-        sign aarFile
-    } else {
-//        throw new GradleException("The artifact file does not exist: $aarFile")
+    // Configure signing to happen after evaluation
+    afterEvaluate {
+        signing.sign publishing.publications.mavenAar
     }
 }
 
-task sourcesJar(type: Jar) {
-    from android.sourceSets.main.java.srcDirs
-    archiveClassifier = 'sources'
-}
-task javadoc(type: Javadoc) {
-    source = android.sourceSets.main.java.srcDirs
-    classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
-    android.libraryVariants.all { var -> classpath += var.javaCompileProvider.get().classpath }
-}
-task javadocJar(type: Jar, dependsOn: javadoc) {
-    archiveClassifier = 'javadoc'
-    from javadoc.destinationDir
+// Enable sources and javadoc generation for Android libraries
+android {
+    publishing {
+        singleVariant('release') {
+            withSourcesJar()
+            withJavadocJar()
+        }
+    }
 }
 
-artifacts {
-    archives javadocJar, sourcesJar
+// Ensure signing happens before publishing
+tasks.withType(PublishToMavenRepository) {
+    dependsOn tasks.withType(Sign)
 }
 
 tasks.withType(GenerateModuleMetadata) {