-
Notifications
You must be signed in to change notification settings - Fork 305
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #582 from adjust/v4351
Version 4.35.1
- Loading branch information
Showing
8 changed files
with
513 additions
and
56 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -74,15 +74,28 @@ artifacts { | |
afterEvaluate { | ||
publishing { | ||
publications { | ||
mavenAndroidCriteo(MavenPublication) { | ||
customizePom(pom) | ||
/* | ||
mavenAndroidCriteoJar(MavenPublication) { | ||
customizePomForJar(pom) | ||
groupId rootProject.ext.adjustGroupId | ||
artifactId 'adjust-android-criteo' | ||
version rootProject.ext.coreVersionName | ||
artifact adjustCriteoAndroidJar | ||
artifact adjustCriteoAndroidSourcesJar | ||
} | ||
*/ | ||
mavenAndroidCriteoAar(MavenPublication) { | ||
customizePomForAar(pom) | ||
groupId rootProject.ext.adjustGroupId | ||
artifactId 'adjust-android-criteo' | ||
version rootProject.ext.coreVersionName | ||
|
||
artifact("$buildDir/outputs/aar/sdk-plugin-criteo-release.aar") { | ||
builtBy tasks.getByPath("adjustCriteoAndroidAar") | ||
} | ||
artifact adjustCriteoAndroidSourcesJar | ||
} | ||
} | ||
|
||
repositories { | ||
|
@@ -98,11 +111,12 @@ afterEvaluate { | |
} | ||
} | ||
signing { | ||
sign publishing.publications.mavenAndroidCriteo | ||
// sign publishing.publications.mavenAndroidCriteoJar | ||
sign publishing.publications.mavenAndroidCriteoAar | ||
} | ||
} | ||
|
||
def customizePom(pom) { | ||
def customizePomForJar(pom) { | ||
pom.withXml { | ||
def root = asNode() | ||
|
||
|
@@ -142,10 +156,50 @@ def customizePom(pom) { | |
} | ||
} | ||
|
||
model { | ||
tasks.generatePomFileForMavenAndroidCriteoPublication { | ||
destination = file("${project.buildDir}/generated-pom.xml") | ||
def customizePomForAar(pom) { | ||
pom.withXml { | ||
def root = asNode() | ||
|
||
// Add all items necessary for maven central publication | ||
root.children().last() + { | ||
resolveStrategy = Closure.DELEGATE_FIRST | ||
description 'The Criteo plugin for Adjust SDK for Android' | ||
name 'Adjust Android SDK Criteo plugin' | ||
url 'https://github.com/adjust/android_sdk' | ||
|
||
organization { | ||
name 'adjust GmbH' | ||
url 'http://www.adjust.com' | ||
} | ||
licenses { | ||
license { | ||
name 'MIT License' | ||
url 'http://www.opensource.org/licenses/mit-license.php' | ||
} | ||
} | ||
scm { | ||
url '[email protected]:adjust/android_sdk.git' | ||
connection 'scm:git:[email protected]:adjust/android_sdk.git' | ||
developerConnection 'scm:git:[email protected]:adjust/android_sdk.git' | ||
} | ||
developers { | ||
developer { | ||
name 'Pedro Silva' | ||
email '[email protected]' | ||
} | ||
developer { | ||
name 'Ugljesa Erceg' | ||
email '[email protected]' | ||
} | ||
} | ||
} | ||
} | ||
} | ||
|
||
model { | ||
// tasks.generatePomFileForMavenAndroidCriteoJarPublication { | ||
// destination = file("${project.buildDir}/generated-pom.xml") | ||
// } | ||
/* TODO check if/how to replace this tasks | ||
tasks.publishMavenAndroidCriteoPublicationToMavenLocal { | ||
dependsOn project.tasks.signArchives | ||
|
@@ -154,6 +208,9 @@ model { | |
dependsOn project.tasks.signArchives | ||
} | ||
*/ | ||
tasks.generatePomFileForMavenAndroidCriteoAarPublication { | ||
destination = file("${project.buildDir}/generated-pom.xml") | ||
} | ||
} | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -80,15 +80,28 @@ artifacts { | |
afterEvaluate { | ||
publishing { | ||
publications { | ||
mavenAndroidImei(MavenPublication) { | ||
customizePom(pom) | ||
/* | ||
mavenAndroidImeiJar(MavenPublication) { | ||
customizePomForJar(pom) | ||
groupId rootProject.ext.adjustGroupId | ||
artifactId 'adjust-android-imei' | ||
version rootProject.ext.coreVersionName | ||
artifact adjustImeiAndroidJar | ||
artifact adjustImeiAndroidSourcesJar | ||
} | ||
*/ | ||
mavenAndroidImeiAar(MavenPublication) { | ||
customizePomForAar(pom) | ||
groupId rootProject.ext.adjustGroupId | ||
artifactId 'adjust-android-imei' | ||
version rootProject.ext.coreVersionName | ||
|
||
artifact("$buildDir/outputs/aar/sdk-plugin-imei-release.aar") { | ||
builtBy tasks.getByPath("adjustImeiAndroidAar") | ||
} | ||
artifact adjustImeiAndroidSourcesJar | ||
} | ||
} | ||
|
||
repositories { | ||
|
@@ -104,11 +117,12 @@ afterEvaluate { | |
} | ||
} | ||
signing { | ||
sign publishing.publications.mavenAndroidImei | ||
// sign publishing.publications.mavenAndroidImeiJar | ||
sign publishing.publications.mavenAndroidImeiAar | ||
} | ||
} | ||
|
||
def customizePom(pom) { | ||
def customizePomForJar(pom) { | ||
pom.withXml { | ||
def root = asNode() | ||
|
||
|
@@ -148,10 +162,50 @@ def customizePom(pom) { | |
} | ||
} | ||
|
||
model { | ||
tasks.generatePomFileForMavenAndroidImeiPublication { | ||
destination = file("${project.buildDir}/generated-pom.xml") | ||
def customizePomForAar(pom) { | ||
pom.withXml { | ||
def root = asNode() | ||
|
||
// Add all items necessary for maven central publication. | ||
root.children().last() + { | ||
resolveStrategy = Closure.DELEGATE_FIRST | ||
description 'The Imei plugin for Adjust SDK for Android' | ||
name 'Adjust Android SDK Imei plugin' | ||
url 'https://github.com/adjust/android_sdk' | ||
|
||
organization { | ||
name 'adjust GmbH' | ||
url 'http://www.adjust.com' | ||
} | ||
licenses { | ||
license { | ||
name 'MIT License' | ||
url 'http://www.opensource.org/licenses/mit-license.php' | ||
} | ||
} | ||
scm { | ||
url '[email protected]:adjust/android_sdk.git' | ||
connection 'scm:git:[email protected]:adjust/android_sdk.git' | ||
developerConnection 'scm:git:[email protected]:adjust/android_sdk.git' | ||
} | ||
developers { | ||
developer { | ||
name 'Pedro Silva' | ||
email '[email protected]' | ||
} | ||
developer { | ||
name 'Ugljesa Erceg' | ||
email '[email protected]' | ||
} | ||
} | ||
} | ||
} | ||
} | ||
|
||
model { | ||
// tasks.generatePomFileForMavenAndroidImeiJarPublication { | ||
// destination = file("${project.buildDir}/generated-pom.xml") | ||
// } | ||
/* TODO check if/how to replace this tasks | ||
tasks.publishMavenAndroidImeiPublicationToMavenLocal { | ||
dependsOn project.tasks.signArchives | ||
|
@@ -160,5 +214,8 @@ model { | |
dependsOn project.tasks.signArchives | ||
} | ||
*/ | ||
tasks.generatePomFileForMavenAndroidImeiAarPublication { | ||
destination = file("${project.buildDir}/generated-pom.xml") | ||
} | ||
} | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -84,15 +84,28 @@ artifacts { | |
afterEvaluate { | ||
publishing { | ||
publications { | ||
mavenAndroidOaid(MavenPublication) { | ||
customizePom(pom) | ||
/* | ||
mavenAndroidOaidJar(MavenPublication) { | ||
customizePomForJar(pom) | ||
groupId rootProject.ext.adjustGroupId | ||
artifactId 'adjust-android-oaid' | ||
version rootProject.ext.coreVersionName | ||
artifact adjustOaidAndroidJar | ||
artifact adjustOaidAndroidSourcesJar | ||
} | ||
*/ | ||
mavenAndroidOaidAar(MavenPublication) { | ||
customizePomForAar(pom) | ||
groupId rootProject.ext.adjustGroupId | ||
artifactId 'adjust-android-oaid' | ||
version rootProject.ext.coreVersionName | ||
|
||
artifact("$buildDir/outputs/aar/sdk-plugin-oaid-release.aar") { | ||
builtBy tasks.getByPath("adjustOaidAndroidAar") | ||
} | ||
artifact adjustOaidAndroidSourcesJar | ||
} | ||
} | ||
|
||
repositories { | ||
|
@@ -108,11 +121,12 @@ afterEvaluate { | |
} | ||
} | ||
signing { | ||
sign publishing.publications.mavenAndroidOaid | ||
// sign publishing.publications.mavenAndroidOaidJar | ||
sign publishing.publications.mavenAndroidOaidAar | ||
} | ||
} | ||
|
||
def customizePom(pom) { | ||
def customizePomForJar(pom) { | ||
pom.withXml { | ||
def root = asNode() | ||
|
||
|
@@ -152,10 +166,50 @@ def customizePom(pom) { | |
} | ||
} | ||
|
||
model { | ||
tasks.generatePomFileForMavenAndroidOaidPublication { | ||
destination = file("${project.buildDir}/generated-pom.xml") | ||
def customizePomForAar(pom) { | ||
pom.withXml { | ||
def root = asNode() | ||
|
||
// Add all items necessary for maven central publication. | ||
root.children().last() + { | ||
resolveStrategy = Closure.DELEGATE_FIRST | ||
description 'The Oaid plugin for Adjust SDK for Android' | ||
name 'Adjust Android SDK Oaid plugin' | ||
url 'https://github.com/adjust/android_sdk' | ||
|
||
organization { | ||
name 'adjust GmbH' | ||
url 'http://www.adjust.com' | ||
} | ||
licenses { | ||
license { | ||
name 'MIT License' | ||
url 'http://www.opensource.org/licenses/mit-license.php' | ||
} | ||
} | ||
scm { | ||
url '[email protected]:adjust/android_sdk.git' | ||
connection 'scm:git:[email protected]:adjust/android_sdk.git' | ||
developerConnection 'scm:git:[email protected]:adjust/android_sdk.git' | ||
} | ||
developers { | ||
developer { | ||
name 'Pedro Silva' | ||
email '[email protected]' | ||
} | ||
developer { | ||
name 'Ugljesa Erceg' | ||
email '[email protected]' | ||
} | ||
} | ||
} | ||
} | ||
} | ||
|
||
model { | ||
// tasks.generatePomFileForMavenAndroidOaidJarPublication { | ||
// destination = file("${project.buildDir}/generated-pom.xml") | ||
// } | ||
/* TODO check if/how to replace this tasks | ||
tasks.publishMavenAndroidOaidPublicationToMavenLocal { | ||
dependsOn project.tasks.signArchives | ||
|
@@ -164,6 +218,9 @@ model { | |
dependsOn project.tasks.signArchives | ||
} | ||
*/ | ||
tasks.generatePomFileForMavenAndroidOaidAarPublication { | ||
destination = file("${project.buildDir}/generated-pom.xml") | ||
} | ||
} | ||
|
||
|
Oops, something went wrong.