Skip to content

Commit f2dafdd

Browse files
Mansi-mParticleMansi-mParticle
authored
feat: Update Android Gradle plugin to 8.1.0 (#99)
1 parent bf5e60f commit f2dafdd

6 files changed

Lines changed: 71 additions & 40 deletions

File tree

‎build.gradle‎

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
buildscript {
2-
ext.kotlin_version = '1.8.10'
2+
ext.kotlin_version = '2.0.20'
33
if (!project.hasProperty('version') || project.version.equals('unspecified')) {
44
project.version = '+'
55
}
@@ -11,15 +11,15 @@ buildscript {
1111
}
1212

1313
dependencies {
14-
classpath 'com.android.tools.build:gradle:7.4.1'
14+
classpath 'com.android.tools.build:gradle:8.1.4'
1515
classpath 'com.mparticle:android-kit-plugin:' + project.version
1616
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1717
}
1818
}
1919

2020
plugins {
2121
id "org.sonarqube" version "3.5.0.2730"
22-
id "org.jlleitschuh.gradle.ktlint" version "11.2.0"
22+
id "org.jlleitschuh.gradle.ktlint" version "13.0.0"
2323
}
2424

2525
sonarqube {
@@ -31,13 +31,24 @@ sonarqube {
3131
}
3232

3333
apply plugin: 'org.jlleitschuh.gradle.ktlint'
34-
apply plugin: 'com.mparticle.kit'
3534
apply plugin: 'kotlin-android'
35+
apply plugin: 'com.mparticle.kit'
3636

3737
android {
38+
namespace 'com.mparticle.kits.adjustkit'
39+
buildFeatures {
40+
buildConfig = true
41+
}
3842
defaultConfig {
3943
minSdkVersion 21
4044
}
45+
compileOptions {
46+
sourceCompatibility JavaVersion.VERSION_17
47+
targetCompatibility JavaVersion.VERSION_17
48+
}
49+
kotlinOptions {
50+
jvmTarget = '17'
51+
}
4152
testOptions {
4253
unitTests.all {
4354
jvmArgs += ['--add-opens', 'java.base/java.lang=ALL-UNNAMED']
@@ -46,6 +57,6 @@ android {
4657
}
4758

4859
dependencies {
49-
testImplementation files('libs/java-json.jar')
60+
testImplementation files('libs/java-json.jar')
5061
api 'com.adjust.sdk:adjust-android:5.0.0'
5162
}

‎gradle.properties‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
android.enableJetifier=true
22
android.useAndroidX=true
3-
org.gradle.daemon=true
4-
org.gradle.jvmargs=-Xmx2560m
3+
org.gradle.daemon=true

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

‎src/main/AndroidManifest.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<manifest package="com.mparticle.kits.adjust"/>
1+
<manifest xmlns:android="http://schemas.android.com/apk/res/android"/>

‎src/main/kotlin/com/mparticle/kits/AdjustKit.kt‎

Lines changed: 49 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -6,42 +6,51 @@ import android.app.Application.ActivityLifecycleCallbacks
66
import android.content.Context
77
import android.content.Intent
88
import android.os.Bundle
9-
import com.adjust.sdk.*
9+
import com.adjust.sdk.Adjust
10+
import com.adjust.sdk.AdjustAttribution
11+
import com.adjust.sdk.AdjustConfig
12+
import com.adjust.sdk.AdjustInstance
13+
import com.adjust.sdk.AdjustReferrerReceiver
14+
import com.adjust.sdk.LogLevel
15+
import com.adjust.sdk.OnAttributionChangedListener
1016
import com.mparticle.AttributionError
1117
import com.mparticle.AttributionResult
1218
import com.mparticle.MParticle
1319
import org.json.JSONException
1420
import org.json.JSONObject
15-
import java.util.*
21+
import java.util.LinkedList
1622

1723
/**
1824
* Embedded implementation of the Adjust SDK
1925
*
2026
*
2127
*/
22-
class AdjustKit : KitIntegration(), OnAttributionChangedListener, ActivityLifecycleCallbacks {
23-
28+
class AdjustKit :
29+
KitIntegration(),
30+
OnAttributionChangedListener,
31+
ActivityLifecycleCallbacks {
2432
override fun getInstance(): AdjustInstance = Adjust.getDefaultInstance()
2533

2634
override fun getName(): String = KIT_NAME
2735

2836
override fun onKitCreate(
2937
settings: Map<String, String>,
30-
context: Context
38+
context: Context,
3139
): List<ReportingMessage> {
3240
val production = MParticle.Environment.Production == MParticle.getInstance()?.environment
33-
val config = AdjustConfig(
34-
getContext(),
35-
getSettings()[APP_TOKEN],
36-
if (production) AdjustConfig.ENVIRONMENT_PRODUCTION else AdjustConfig.ENVIRONMENT_SANDBOX
37-
)
41+
val config =
42+
AdjustConfig(
43+
getContext(),
44+
getSettings()[APP_TOKEN],
45+
if (production) AdjustConfig.ENVIRONMENT_PRODUCTION else AdjustConfig.ENVIRONMENT_SANDBOX,
46+
)
3847
config.setOnAttributionChangedListener(this)
3948
if (deeplinkResponseListenerProxy != null) {
4049
val listener = deeplinkResponseListenerProxy
4150
if (listener != null) {
4251
config.setOnDeferredDeeplinkResponseListener { deeplink ->
4352
listener.launchReceivedDeeplink(
44-
deeplink
53+
deeplink,
4554
)
4655
}
4756
}
@@ -52,7 +61,7 @@ class AdjustKit : KitIntegration(), OnAttributionChangedListener, ActivityLifecy
5261
}
5362
val fbAppId = getSettings()[FB_APP_ID_KEY]
5463
if (fbAppId != null) {
55-
config.setFbAppId(fbAppId);
64+
config.setFbAppId(fbAppId)
5665
}
5766
Adjust.initSdk(config)
5867
setAdidIntegrationAttribute()
@@ -69,9 +78,11 @@ class AdjustKit : KitIntegration(), OnAttributionChangedListener, ActivityLifecy
6978
val messageList: MutableList<ReportingMessage> = LinkedList()
7079
messageList.add(
7180
ReportingMessage(
72-
this, ReportingMessage.MessageType.OPT_OUT, System.currentTimeMillis(), null
73-
)
74-
.setOptOut(optOutStatus)
81+
this,
82+
ReportingMessage.MessageType.OPT_OUT,
83+
System.currentTimeMillis(),
84+
null,
85+
).setOptOut(optOutStatus),
7586
)
7687
return messageList
7788
}
@@ -84,28 +95,41 @@ class AdjustKit : KitIntegration(), OnAttributionChangedListener, ActivityLifecy
8495
try {
8596
jsonObject = toJSON(attribution)
8697
} catch (e: JSONException) {
87-
val error = AttributionError()
88-
.setMessage(e.message)
89-
.setServiceProviderId(MParticle.ServiceProviders.ADJUST)
98+
val error =
99+
AttributionError()
100+
.setMessage(e.message)
101+
.setServiceProviderId(MParticle.ServiceProviders.ADJUST)
90102
kitManager.onError(error)
91103
}
92-
val deepLinkResult = AttributionResult()
93-
.setParameters(jsonObject)
94-
.setServiceProviderId(MParticle.ServiceProviders.ADJUST)
104+
val deepLinkResult =
105+
AttributionResult()
106+
.setParameters(jsonObject)
107+
.setServiceProviderId(MParticle.ServiceProviders.ADJUST)
95108
kitManager.onResult(deepLinkResult)
96109
}
97110

98-
override fun onActivityCreated(activity: Activity, savedInstanceState: Bundle?) {}
111+
override fun onActivityCreated(
112+
activity: Activity,
113+
savedInstanceState: Bundle?,
114+
) {}
115+
99116
override fun onActivityStarted(activity: Activity) {}
117+
100118
override fun onActivityResumed(activity: Activity) {
101119
}
102120

103121
override fun onActivityPaused(activity: Activity) {
104122
}
105123

106124
override fun onActivityStopped(activity: Activity) {}
107-
override fun onActivitySaveInstanceState(activity: Activity, outState: Bundle) {}
125+
126+
override fun onActivitySaveInstanceState(
127+
activity: Activity,
128+
outState: Bundle,
129+
) {}
130+
108131
override fun onActivityDestroyed(activity: Activity) {}
132+
109133
private fun setAdidIntegrationAttribute() {
110134
val integrationAttributes = integrationAttributes
111135
Adjust.getAdid { adid ->
@@ -126,15 +150,14 @@ class AdjustKit : KitIntegration(), OnAttributionChangedListener, ActivityLifecy
126150

127151
@JvmStatic
128152
@Throws(JSONException::class)
129-
fun toJSON(attribution: AdjustAttribution): JSONObject {
130-
return JSONObject()
153+
fun toJSON(attribution: AdjustAttribution): JSONObject =
154+
JSONObject()
131155
.putOpt("tracker_token", attribution.trackerToken)
132156
.putOpt("tracker_name", attribution.trackerName)
133157
.putOpt("network", attribution.network)
134158
.putOpt("campaign", attribution.campaign)
135159
.putOpt("adgroup", attribution.adgroup)
136160
.putOpt("creative", attribution.creative)
137161
.putOpt("click_label", attribution.clickLabel)
138-
}
139162
}
140163
}

‎src/test/kotlin/com/mparticle/kits/AdjustKitTests.kt‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
package com.mparticle.kits
22

33
import android.content.Context
4-
import com.adjust.sdk.AdjustAttribution
54
import com.mparticle.MParticleOptions
6-
import com.mparticle.kits.AdjustKit.Companion.toJSON
75
import org.json.JSONException
86
import org.json.JSONObject
97
import org.junit.Assert
@@ -12,7 +10,7 @@ import org.mockito.Mockito
1210

1311
class AdjustKitTests {
1412
private val kit: KitIntegration
15-
get() = AdjustKit()
13+
get() = AdjustKit()
1614

1715
@Test
1816
@Throws(Exception::class)
@@ -65,7 +63,7 @@ class AdjustKitTests {
6563

6664
@get:Throws(JSONException::class)
6765
private val attributionJSON: JSONObject
68-
get() {
66+
get() {
6967
val jsonObject = JSONObject()
7068
jsonObject.putOpt("tracker_token", "a1")
7169
jsonObject.putOpt("tracker_name", "b2")
@@ -77,4 +75,4 @@ class AdjustKitTests {
7775
jsonObject.putOpt("adid", "h8")
7876
return jsonObject
7977
}
80-
}
78+
}

0 commit comments

Comments
 (0)