Skip to content

Commit 5681f8e

Browse files
committed
switched to maven-publish
The upgrade was required since `maven` doesn't work with Gradle 7. Followed the following documentation: * [Android - Use the Maven Publish plugin](https://developer.android.com/studio/build/maven-publish-plugin) * [DSL documentation}(https://docs.gradle.org/current/dsl/org.gradle.api.publish.maven.MavenPublication.html)
1 parent bbcb79a commit 5681f8e

File tree

1 file changed

+31
-51
lines changed

1 file changed

+31
-51
lines changed

OneSignalSDK/onesignal/maven-push.gradle

Lines changed: 31 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
*
1818
*/
1919

20-
apply plugin: 'maven'
20+
apply plugin: 'maven-publish'
2121
apply plugin: 'signing'
2222

2323
class Global {
@@ -41,10 +41,6 @@ class Global {
4141
static def RELEASE_REPOSITORY_URL = 'https://oss.sonatype.org/service/local/staging/deploy/maven2'
4242
}
4343

44-
def isReleaseBuild() {
45-
return !Global.VERSION_NAME.contains("SNAPSHOT")
46-
}
47-
4844
def getRepositoryUsername() {
4945
return hasProperty('NEXUS_USERNAME') ? NEXUS_USERNAME : ""
5046
}
@@ -53,47 +49,49 @@ def getRepositoryPassword() {
5349
return hasProperty('NEXUS_PASSWORD') ? NEXUS_PASSWORD : ""
5450
}
5551

56-
afterEvaluate { project ->
57-
uploadArchives {
52+
afterEvaluate {
53+
publishing {
5854
repositories {
59-
mavenDeployer {
60-
beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
61-
62-
pom.groupId = Global.GROUP_ID
63-
pom.artifactId = Global.POM_ARTIFACT_ID
64-
pom.version = Global.VERSION_NAME
65-
66-
repository(url: Global.RELEASE_REPOSITORY_URL) {
67-
authentication(userName: getRepositoryUsername(), password: getRepositoryPassword())
68-
}
69-
snapshotRepository(url: Global.SNAPSHOT_REPOSITORY_URL) {
70-
authentication(userName: getRepositoryUsername(), password: getRepositoryPassword())
55+
maven {
56+
url = Global.RELEASE_REPOSITORY_URL
57+
credentials {
58+
username = getRepositoryUsername()
59+
password = getRepositoryPassword()
7160
}
61+
}
62+
}
7263

73-
pom.project {
74-
name Global.POM_NAME
75-
packaging Global.POM_PACKAGING
76-
description Global.POM_DESCRIPTION
77-
url Global.POM_URL
64+
publications {
65+
release(MavenPublication) {
66+
from components.release
67+
groupId = Global.GROUP_ID
68+
artifactId = Global.POM_ARTIFACT_ID
69+
version = Global.VERSION_NAME
70+
71+
pom {
72+
name = Global.POM_NAME
73+
packaging = Global.POM_PACKAGING
74+
description = Global.POM_DESCRIPTION
75+
url = Global.POM_URL
7876

7977
scm {
80-
url Global.POM_SCM_URL
81-
connection Global.POM_SCM_CONNECTION
82-
developerConnection Global.POM_SCM_DEV_CONNECTION
78+
url = Global.POM_SCM_URL
79+
connection = Global.POM_SCM_CONNECTION
80+
developerConnection = Global.POM_SCM_DEV_CONNECTION
8381
}
8482

8583
licenses {
8684
license {
87-
name Global.POM_LICENCE_NAME
88-
url Global.POM_LICENCE_URL
89-
distribution Global.POM_LICENCE_DIST
85+
name = Global.POM_LICENCE_NAME
86+
url = Global.POM_LICENCE_URL
87+
distribution = Global.POM_LICENCE_DIST
9088
}
9189
}
9290

9391
developers {
9492
developer {
95-
id Global.POM_DEVELOPER_ID
96-
name Global.POM_DEVELOPER_NAME
93+
id = Global.POM_DEVELOPER_ID
94+
name = Global.POM_DEVELOPER_NAME
9795
}
9896
}
9997
}
@@ -102,25 +100,7 @@ afterEvaluate { project ->
102100
}
103101

104102
signing {
105-
required { isReleaseBuild() && gradle.taskGraph.hasTask("uploadArchives") }
103+
required { true }
106104
sign configurations.archives
107105
}
108-
109-
//task androidJavadocs(type: Javadoc) {
110-
//source = android.sourceSets.main.allJava
111-
//}
112-
113-
//task androidJavadocsJar(type: Jar, dependsOn: androidJavadocs) {
114-
//classifier = 'javadoc'
115-
//from androidJavadocs.destinationDir
116-
//}
117-
118-
task androidSourcesJar(type: Jar) {
119-
classifier = 'sources'
120-
from android.sourceSets.main.java.sourceFiles
121-
}
122-
123-
artifacts {
124-
archives androidSourcesJar
125-
}
126106
}

0 commit comments

Comments
 (0)