Skip to content

Commit fb0e0e3

Browse files
shashanksushashanksu
authored
Merge pull request #5 from adjust/v101
2 parents 2c1b20e + 1012f38 commit fb0e0e3

File tree

8 files changed

+145
-79
lines changed

8 files changed

+145
-79
lines changed

‎AdjustAdobeExtension/adobeextension/build.gradle

Lines changed: 8 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,15 @@
1-
plugins {
2-
id 'com.android.library'
3-
id 'com.jfrog.bintray'
4-
id 'maven-publish'
5-
}
1+
apply plugin: 'com.android.library'
2+
apply from: 'publish.gradle'
63

74
android {
85
compileSdkVersion 30
9-
buildToolsVersion '30.0.2'
6+
buildToolsVersion '30.0.3'
107

118
defaultConfig {
129
minSdkVersion 14
1310
targetSdkVersion 30
1411
versionCode 1
15-
versionName '1.0.0'
12+
versionName '1.0.1'
1613

1714
consumerProguardFiles "consumer-rules.pro"
1815
}
@@ -26,57 +23,7 @@ android {
2623
}
2724

2825
dependencies {
29-
implementation 'com.adjust.sdk:adjust-android:4.24.1'
30-
implementation 'com.adobe.marketing.mobile:sdk-core:1.5.7'
31-
}
32-
33-
//region Publish to jCenter
34-
def libGroupId = 'com.adjust.adobeextension'
35-
def libArtifactId = 'adobeextension'
36-
def libVersion = '1.0.0'
37-
def libDesc = 'This is the Android Adobe Mobile Extension of Adjust.'
38-
def libLicenses = ['MIT License']
39-
def libVCSUrl = 'https://github.com/adjust/android_adobe_extension.git'
40-
41-
// Generate Source Jar
42-
task sourceJar(type: Jar) {
43-
from android.sourceSets.main.java.srcDirs
44-
classifier "sources"
45-
}
46-
47-
// Create the publication with the pom configuration
48-
publishing {
49-
publications {
50-
AdobeExtensionAar(MavenPublication) {
51-
groupId libGroupId
52-
artifactId libArtifactId
53-
version libVersion
54-
artifact(sourceJar)
55-
artifact("$buildDir/outputs/aar/$libArtifactId-release.aar")
56-
}
57-
}
58-
}
59-
60-
// Bintray config
61-
Properties properties = new Properties()
62-
properties.load(project.rootProject.file('local.properties').newDataInputStream())
63-
64-
bintray {
65-
user = properties.getProperty("bintray.user")
66-
key = properties.getProperty("bintray.apikey")
67-
publications = ['AdobeExtensionAar']
68-
pkg {
69-
repo = "Maven"
70-
name = "$libGroupId:$libArtifactId"
71-
desc = libDesc
72-
licenses = libLicenses
73-
vcsUrl = libVCSUrl
74-
version {
75-
name = libVersion
76-
vcsTag = libVersion
77-
released = new Date()
78-
}
79-
}
80-
}
81-
82-
26+
implementation 'androidx.test.ext:junit:1.1.2'
27+
implementation 'com.adjust.sdk:adjust-android:4.27.0'
28+
implementation 'com.adobe.marketing.mobile:sdk-core:1.8.0'
29+
}

‎AdjustAdobeExtension/adobeextension/publish.gradle

Lines changed: 103 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,103 @@
1+
apply plugin: 'maven-publish'
2+
apply plugin: 'signing'
3+
4+
// init
5+
def libGroupId = 'com.adjust.adobeextension'
6+
def libArtifactId = 'adobeextension'
7+
def libVersion = '1.0.1'
8+
def libName = 'Adjust Extension for Adobe Experience SDK'
9+
def libDesc = 'This is the Android Adobe Mobile Extension of Adjust.'
10+
def libUrl = 'https://github.com/adjust/android_adobe_extension'
11+
12+
ext["signing.keyId"] = ''
13+
ext["signing.password"] = ''
14+
ext["signing.secretKeyRingFile"] = ''
15+
ext["sonatypeUsername"] = ''
16+
ext["sonatypePassword"] = ''
17+
18+
// read local properties
19+
File localPropsFile = project.rootProject.file('local.properties')
20+
if (localPropsFile.exists()) {
21+
Properties p = new Properties()
22+
new FileInputStream(localPropsFile).withCloseable { is ->
23+
p.load(is)
24+
}
25+
p.each { name, value ->
26+
ext[name] = value
27+
}
28+
}
29+
30+
// Generate Source Jar
31+
task sourceJar(type: Jar) {
32+
from android.sourceSets.main.java.srcDirs
33+
classifier "sources"
34+
}
35+
36+
// Create the publication with the pom configuration
37+
def pomConfig = {
38+
organization {
39+
name 'adjust GmbH'
40+
url 'http://www.adjust.com'
41+
}
42+
licenses {
43+
license {
44+
name 'MIT License'
45+
url 'http://www.opensource.org/licenses/mit-license.php'
46+
}
47+
}
48+
scm {
49+
url '[email protected]:adjust/android_adobe_extension.git'
50+
connection 'scm:git:[email protected]:adjust/android_adobe_extension.git'
51+
developerConnection 'scm:git:[email protected]:adjust/android_adobe_extension.git'
52+
}
53+
developers {
54+
developer {
55+
name 'Pedro Silva'
56+
email '[email protected]'
57+
}
58+
developer {
59+
name 'Shashank Suhane'
60+
email '[email protected]'
61+
}
62+
developer {
63+
name 'Ugljesa Erceg'
64+
email '[email protected]'
65+
}
66+
}
67+
}
68+
69+
publishing {
70+
publications {
71+
AdobeExtensionAar(MavenPublication) {
72+
groupId libGroupId
73+
artifactId libArtifactId
74+
version libVersion
75+
artifact(sourceJar)
76+
artifact("$buildDir/outputs/aar/$libArtifactId-release.aar")
77+
pom.withXml {
78+
def root = asNode()
79+
root.appendNode('description', libDesc)
80+
root.appendNode('name', libName)
81+
root.appendNode('url', libUrl)
82+
root.children().last() + pomConfig
83+
}
84+
}
85+
}
86+
87+
repositories {
88+
maven {
89+
name = "mavencentral"
90+
url = "https://oss.sonatype.org/service/local/staging/deploy/maven2/"
91+
credentials {
92+
username sonatypeUsername
93+
password sonatypePassword
94+
}
95+
}
96+
}
97+
}
98+
99+
signing {
100+
sign publishing.publications
101+
}
102+
103+

‎AdjustAdobeExtension/adobeextension/src/main/java/com/adjust/adobeextension/AdjustAdobeExtensionConstants.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
class AdjustAdobeExtensionConstants {
44
static final String LOG_TAG = "AdjustAdobeExtension";
55
static final String EXTENSION_NAME = "com.adjust.adobeextension";
6-
static final String EXTENSION_VERSION = "adobe_ext1.0.0";
6+
static final String EXTENSION_VERSION = "adobe_ext1.0.1";
77

88
static final String EVENT_TYPE_ADOBE_HUB = "com.adobe.eventType.hub";
99
static final String EVENT_TYPE_ADOBE_GENERIC_TRACK = "com.adobe.eventType.generic.track";

‎AdjustAdobeExtension/build.gradle

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,7 @@ buildscript {
55
jcenter()
66
}
77
dependencies {
8-
classpath 'com.android.tools.build:gradle:4.1.1'
9-
10-
// for maven publishing
11-
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.1'
8+
classpath 'com.android.tools.build:gradle:4.1.3'
129
}
1310
}
1411

‎AdjustAdobeExtension/example-app/build.gradle

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,15 @@ plugins {
22
id 'com.android.application'
33
}
44

5+
repositories {
6+
maven {
7+
url "https://oss.sonatype.org/content/repositories/staging/"
8+
}
9+
}
10+
511
android {
612
compileSdkVersion 30
7-
buildToolsVersion "30.0.2"
13+
buildToolsVersion "30.0.3"
814

915
defaultConfig {
1016
applicationId "com.adjust.examples"
@@ -31,18 +37,20 @@ android {
3137
dependencies {
3238

3339
implementation 'androidx.appcompat:appcompat:1.2.0'
34-
implementation 'com.google.android.material:material:1.2.1'
35-
implementation 'androidx.constraintlayout:constraintlayout:2.0.2'
36-
implementation 'androidx.navigation:navigation-fragment:2.3.1'
37-
implementation 'androidx.navigation:navigation-ui:2.3.1'
38-
testImplementation 'junit:junit:4.13.1'
40+
implementation 'com.google.android.material:material:1.3.0'
41+
implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
42+
implementation 'androidx.navigation:navigation-fragment:2.3.5'
43+
implementation 'androidx.navigation:navigation-ui:2.3.5'
44+
testImplementation 'junit:junit:4.13.2'
3945
androidTestImplementation 'androidx.test.ext:junit:1.1.2'
4046
androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
4147

42-
implementation 'com.adobe.marketing.mobile:sdk-core:1.5.7'
48+
implementation 'com.adobe.marketing.mobile:sdk-core:1.8.0'
4349
implementation 'com.google.android.gms:play-services-ads-identifier:17.0.0'
44-
implementation 'com.android.installreferrer:installreferrer:2.1'
50+
implementation 'com.android.installreferrer:installreferrer:2.2'
51+
52+
implementation 'com.adjust.sdk:adjust-android:4.27.0'
4553

46-
implementation 'com.adjust.sdk:adjust-android:4.24.1'
4754
implementation project(path: ':adobeextension')
55+
//implementation 'com.adjust.adobeextension:adobeextension:1.0.1'
4856
}

‎CHANGELOG.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
### Version 1.0.1 (20th April 2021)
2+
#### Updated
3+
- Updated native Android SDK dependency to version 4.27.0.
4+
- Updated gradle script for publishing to Maven central.
5+
6+
#### Native Android SDK
7+
- [[email protected]][android_sdk_v4.27.0]
8+
9+
---
10+
111
### Version 1.0.0 (3rd December 2020)
212
#### Added
313
- Official release of the Adjust Android SDK Adobe Extension.
@@ -15,3 +25,4 @@
1525
- [[email protected]][android_sdk_v4.24.1]
1626

1727
[android_sdk_v4.24.1]: https://github.com/adjust/android_sdk/tree/v4.24.1
28+
[android_sdk_v4.27.0]: https://github.com/adjust/android_sdk/tree/v4.27.0

‎README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,9 @@ These are the minimum required steps to integrate the Adjust Extension in your A
4747
If you are using [`Maven`][maven], add the following to your `build.gradle` file:
4848

4949
```gradle
50-
implementation 'com.adjust.adobeextension:adobeextension:1.0.0'
51-
implementation 'com.adjust.sdk:adjust-android:4.24.1'
52-
implementation 'com.android.installreferrer:installreferrer:2.1'
50+
implementation 'com.adjust.adobeextension:adobeextension:1.0.1'
51+
implementation 'com.adjust.sdk:adjust-android:4.27.0'
52+
implementation 'com.android.installreferrer:installreferrer:2.2'
5353
```
5454

5555
### <a id="qs-gps"></a>Add Google Play Services

‎VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.0.0
1+
1.0.1

0 commit comments

Comments
 (0)