Skip to content

Commit 948427b

Browse files
committed
Version 3.1.1
1 parent ab60806 commit 948427b

File tree

4 files changed

+18
-76
lines changed

4 files changed

+18
-76
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,14 @@ For the complete documentation, see the [Android SDK Guide](https://cloudinary.c
4141
### Gradle Integration
4242
Add the following dependency to your build.gradle:
4343

44-
`implementation 'com.cloudinary:cloudinary-android:3.1.0'`
44+
`implementation 'com.cloudinary:cloudinary-android:3.1.1'`
4545
### Other Options ######################################################################
4646
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:
4747

4848
<dependency>
4949
<groupId>com.cloudinary</groupId>
5050
<artifactId>cloudinary-android</artifactId>
51-
<version>3.1.0</version>
51+
<version>3.1.1</version>
5252
</dependency>
5353

5454
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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
* Must be initialized before use, see {@link #init(Context, SignatureProvider, Map)}.
4040
*/
4141
public class MediaManager {
42-
public static final String VERSION = "3.1.0";
42+
public static final String VERSION = "3.1.1";
4343
public static final String INTENT_EXTRA_REQUEST_ID = "INTENT_EXTRA_REQUEST_ID";
4444
public static final String INTENT_EXTRA_REQUEST_RESULT_STATUS = "INTENT_EXTRA_REQUEST_RESULT_STATUS";
4545
public static final String ACTION_REQUEST_STARTED = "com.cloudinary.ACTION_REQUEST_STARTED";

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ [email protected]
1313

1414
# These two properties must use these exact names to be compatible with 'gradle install' plugin.
1515
group=com.cloudinary
16-
version=3.1.0
16+
version=3.1.1
1717
cloudinaryLibsVersion=2.3.0
1818

1919
org.gradle.jvmargs=-Xmx1024m

publish.gradle

Lines changed: 14 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -19,23 +19,6 @@ if (hasProperty("ossrhTokenPassword")) {
1919
mavenAar(MavenPublication) {
2020
from components.android
2121

22-
artifact("$buildDir/outputs/aar/$jarFileName-release.aar")
23-
24-
artifact(file("$buildDir/libs/$jarFileName-$version-javadoc.jar.asc")) {
25-
classifier = 'javadoc'
26-
extension = 'jar.asc'
27-
}
28-
29-
artifact(file("$buildDir/libs/$jarFileName-$version-sources.jar.asc")) {
30-
classifier = 'sources'
31-
extension = 'jar.asc'
32-
}
33-
34-
artifact(file("$buildDir/outputs/aar/$jarFileName-release.aar.asc")) {
35-
classifier = null
36-
extension = 'aar.asc'
37-
}
38-
3922
pom {
4023
name = publishArtifactName
4124
packaging = 'aar'
@@ -63,28 +46,6 @@ if (hasProperty("ossrhTokenPassword")) {
6346
url = scmUrl
6447
}
6548
}
66-
67-
pom.withXml {
68-
def pomFile = file("${project.buildDir}/generated-pom.xml")
69-
writeTo(pomFile)
70-
def pomAscFile = signing.sign(pomFile).signatureFiles[0]
71-
artifact(pomAscFile) {
72-
classifier = null
73-
extension = 'pom.asc'
74-
}
75-
}
76-
77-
project.tasks.signArchives.signatureFiles.each {
78-
artifact(it) {
79-
def matcher = it.file =~ /-(sources|javadoc)\.jar\.asc$/
80-
if (matcher.find()) {
81-
classifier = matcher.group(1)
82-
} else {
83-
classifier = null
84-
}
85-
extension = 'jar.asc'
86-
}
87-
}
8849
}
8950
}
9051

@@ -96,46 +57,27 @@ if (hasProperty("ossrhTokenPassword")) {
9657
}
9758
}
9859
}
99-
100-
model {
101-
tasks.generatePomFileForMavenAarPublication {
102-
destination = file("$buildDir/generated-pom.xml")
103-
}
104-
tasks.publishMavenAarPublicationToMavenLocal {
105-
dependsOn project.tasks.signArchives
106-
}
107-
tasks.publishMavenAarPublicationToSonatypeRepository {
108-
dependsOn project.tasks.signArchives
109-
}
110-
}
11160
}
112-
}
11361

114-
task signAar(type: Sign) {
115-
def aarFile = file("$buildDir/outputs/aar/$jarFileName-release.aar")
116-
if (aarFile.exists()) {
117-
sign aarFile
118-
} else {
119-
// throw new GradleException("The artifact file does not exist: $aarFile")
62+
// Configure signing to happen after evaluation
63+
afterEvaluate {
64+
signing.sign publishing.publications.mavenAar
12065
}
12166
}
12267

123-
task sourcesJar(type: Jar) {
124-
from android.sourceSets.main.java.srcDirs
125-
archiveClassifier = 'sources'
126-
}
127-
task javadoc(type: Javadoc) {
128-
source = android.sourceSets.main.java.srcDirs
129-
classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
130-
android.libraryVariants.all { var -> classpath += var.javaCompileProvider.get().classpath }
131-
}
132-
task javadocJar(type: Jar, dependsOn: javadoc) {
133-
archiveClassifier = 'javadoc'
134-
from javadoc.destinationDir
68+
// Enable sources and javadoc generation for Android libraries
69+
android {
70+
publishing {
71+
singleVariant('release') {
72+
withSourcesJar()
73+
withJavadocJar()
74+
}
75+
}
13576
}
13677

137-
artifacts {
138-
archives javadocJar, sourcesJar
78+
// Ensure signing happens before publishing
79+
tasks.withType(PublishToMavenRepository) {
80+
dependsOn tasks.withType(Sign)
13981
}
14082

14183
tasks.withType(GenerateModuleMetadata) {

0 commit comments

Comments
 (0)