Skip to content

Commit 65855e5

Browse files
Mansi-mParticleMansi-mParticle
authored
feat: Update Android Gradle plugin to 8.0.2 (#76)
1 parent a6853e6 commit 65855e5

File tree

4 files changed

+91
-39
lines changed

4 files changed

+91
-39
lines changed

‎build.gradle‎

Lines changed: 22 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,25 @@
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
}
66

77
repositories {
8-
mavenLocal()
98
google()
9+
mavenLocal()
1010
mavenCentral()
1111
}
12+
1213
dependencies {
13-
classpath 'com.android.tools.build:gradle:7.4.1'
14+
classpath 'com.android.tools.build:gradle:8.1.4'
1415
classpath 'com.mparticle:android-kit-plugin:' + project.version
1516
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1617
}
1718
}
1819

1920
plugins {
2021
id "org.sonarqube" version "3.5.0.2730"
21-
id "org.jlleitschuh.gradle.ktlint" version "11.2.0"
22+
id "org.jlleitschuh.gradle.ktlint" version "13.0.0"
2223
}
2324

2425
sonarqube {
@@ -30,13 +31,29 @@ sonarqube {
3031
}
3132

3233
apply plugin: 'org.jlleitschuh.gradle.ktlint'
33-
apply plugin: 'com.mparticle.kit'
3434
apply plugin: 'kotlin-android'
35+
apply plugin: 'com.mparticle.kit'
3536

3637
android {
38+
namespace 'com.mparticle.kits.kochava'
39+
buildFeatures {
40+
buildConfig = true
41+
}
3742
defaultConfig {
3843
minSdkVersion 16
3944
}
45+
compileOptions {
46+
sourceCompatibility JavaVersion.VERSION_17
47+
targetCompatibility JavaVersion.VERSION_17
48+
}
49+
kotlinOptions {
50+
jvmTarget = '17'
51+
}
52+
testOptions {
53+
unitTests.all {
54+
jvmArgs += ['--add-opens', 'java.base/java.lang=ALL-UNNAMED']
55+
}
56+
}
4057
}
4158

4259
dependencies {

‎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 & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
1-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2-
package="com.mparticle.kits.kochava">
3-
1+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
42
<uses-permission android:name="android.permission.INTERNET" />
53
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
64
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
7-
85
</manifest>

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

Lines changed: 67 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,15 @@ import com.mparticle.kits.KitIntegration.AttributeListener
1313
import org.json.JSONException
1414
import org.json.JSONObject
1515

16-
class KochavaKit : KitIntegration(), AttributeListener, KitIntegration.IdentityListener {
16+
class KochavaKit :
17+
KitIntegration(),
18+
AttributeListener,
19+
KitIntegration.IdentityListener {
1720
override fun getName(): String = NAME
1821

1922
override fun onKitCreate(
2023
settings: Map<String, String>,
21-
context: Context
24+
context: Context,
2225
): List<ReportingMessage>? {
2326
val attributionEnabled = java.lang.Boolean.parseBoolean(getSettings()[RETRIEVE_ATT_DATA])
2427
var logLevel = LogLevel.NONE
@@ -27,7 +30,8 @@ class KochavaKit : KitIntegration(), AttributeListener, KitIntegration.IdentityL
2730
}
2831
Tracker.getInstance().setLogLevel(logLevel)
2932

30-
Tracker.getInstance()
33+
Tracker
34+
.getInstance()
3135
.setAppLimitAdTracking(java.lang.Boolean.parseBoolean(getSettings()[LIMIT_ADD_TRACKING]))
3236
val configuration = getSettings()[APP_ID]
3337
if (configuration != null) {
@@ -46,22 +50,23 @@ class KochavaKit : KitIntegration(), AttributeListener, KitIntegration.IdentityL
4650
try {
4751
setAttributionResultParameter(
4852
ATTRIBUTION_PARAMETERS,
49-
installAttribution.toJson()
53+
installAttribution.toJson(),
5054
)
5155
} catch (e: JSONException) {
52-
val error = AttributionError()
53-
.setMessage("unable to parse attribution JSON:\n $installAttribution")
56+
val error =
57+
AttributionError()
58+
.setMessage("unable to parse attribution JSON:\n $installAttribution")
5459
kitManager.onError(error)
5560
}
5661
}
5762
}
58-
Tracker.getInstance()
63+
Tracker
64+
.getInstance()
5965
.processDeeplink(kitManager.launchUri.toString()) { deeplink ->
6066
setAttributionResultParameter(
6167
ENHANCED_DEEPLINK_PARAMETERS,
62-
deeplink.toJson()
68+
deeplink.toJson(),
6369
)
64-
6570
}
6671
}
6772
} catch (e: Exception) {
@@ -74,14 +79,31 @@ class KochavaKit : KitIntegration(), AttributeListener, KitIntegration.IdentityL
7479
override fun setLocation(location: Location) {
7580
}
7681

77-
override fun setUserAttribute(attributeKey: String, attributeValue: String) {}
78-
override fun setUserAttributeList(s: String, list: List<String>) {}
82+
override fun setUserAttribute(
83+
attributeKey: String,
84+
attributeValue: String,
85+
) {}
86+
87+
override fun setUserAttributeList(
88+
s: String,
89+
list: List<String>,
90+
) {}
91+
7992
override fun supportsAttributeLists(): Boolean = true
80-
override fun setAllUserAttributes(map: Map<String, String>, map1: Map<String, List<String>>) {}
93+
94+
override fun setAllUserAttributes(
95+
map: Map<String, String>,
96+
map1: Map<String, List<String>>,
97+
) {}
98+
8199
override fun removeUserAttribute(key: String) {}
100+
82101
override fun setInstallReferrer(intent: Intent) {}
83102

84-
override fun setUserIdentity(identityType: IdentityType, id: String) {
103+
override fun setUserIdentity(
104+
identityType: IdentityType,
105+
id: String,
106+
) {
85107
val possibleIdentities = listOf(USER_IDENTIFICATION_TYPE, EMAIL_IDENTIFICATION_TYPE)
86108
possibleIdentities.forEach {
87109
if (it == identityType.name) {
@@ -91,6 +113,7 @@ class KochavaKit : KitIntegration(), AttributeListener, KitIntegration.IdentityL
91113
}
92114

93115
override fun removeUserIdentity(identityType: IdentityType) {}
116+
94117
override fun logout(): List<ReportingMessage> = emptyList()
95118

96119
override fun setOptOut(optOutStatus: Boolean): List<ReportingMessage> {
@@ -101,22 +124,27 @@ class KochavaKit : KitIntegration(), AttributeListener, KitIntegration.IdentityL
101124
this,
102125
ReportingMessage.MessageType.OPT_OUT,
103126
System.currentTimeMillis(),
104-
null
105-
).setOptOut(optOutStatus)
127+
null,
128+
).setOptOut(optOutStatus),
106129
)
107130
}
108131

109-
private fun setAttributionResultParameter(key: String, value: JSONObject) {
132+
private fun setAttributionResultParameter(
133+
key: String,
134+
value: JSONObject,
135+
) {
110136
try {
111137
val parameters = JSONObject().put(key, value)
112-
val result = AttributionResult()
113-
.setServiceProviderId(configuration.kitId)
114-
.setParameters(parameters)
138+
val result =
139+
AttributionResult()
140+
.setServiceProviderId(configuration.kitId)
141+
.setParameters(parameters)
115142
kitManager.onResult(result)
116143
} catch (e: JSONException) {
117-
val error = AttributionError()
118-
.setServiceProviderId(configuration.kitId)
119-
.setMessage(e.message)
144+
val error =
145+
AttributionError()
146+
.setServiceProviderId(configuration.kitId)
147+
.setMessage(e.message)
120148
kitManager.onError(error)
121149
}
122150
}
@@ -133,16 +161,22 @@ class KochavaKit : KitIntegration(), AttributeListener, KitIntegration.IdentityL
133161
private const val ENABLE_LOGGING = "enableLogging"
134162
const val NAME = "Kochava"
135163
private var identityLink: Map<String, String>? = null
164+
136165
fun setIdentityLink(identityLink: Map<String, String>?) {
137166
Companion.identityLink = identityLink
138167
}
139168
}
140169

141-
override fun onIdentifyCompleted(user: MParticleUser?, p1: FilteredIdentityApiRequest?) {
142-
170+
override fun onIdentifyCompleted(
171+
user: MParticleUser?,
172+
p1: FilteredIdentityApiRequest?,
173+
) {
143174
}
144175

145-
override fun onLoginCompleted(user: MParticleUser?, p1: FilteredIdentityApiRequest?) {
176+
override fun onLoginCompleted(
177+
user: MParticleUser?,
178+
p1: FilteredIdentityApiRequest?,
179+
) {
146180
val identityLinks = mutableMapOf<String, String>()
147181
user?.userIdentities?.iterator()?.forEach {
148182
identityLinks.put(it.key.name, it.value)
@@ -151,12 +185,16 @@ class KochavaKit : KitIntegration(), AttributeListener, KitIntegration.IdentityL
151185
setIdentityLink(identityLink)
152186
}
153187

154-
override fun onLogoutCompleted(user: MParticleUser?, p1: FilteredIdentityApiRequest?) {
155-
188+
override fun onLogoutCompleted(
189+
user: MParticleUser?,
190+
p1: FilteredIdentityApiRequest?,
191+
) {
156192
}
157193

158-
override fun onModifyCompleted(user: MParticleUser?, p1: FilteredIdentityApiRequest?) {
159-
194+
override fun onModifyCompleted(
195+
user: MParticleUser?,
196+
p1: FilteredIdentityApiRequest?,
197+
) {
160198
}
161199

162200
override fun onUserIdentified(user: MParticleUser?) {

0 commit comments

Comments
 (0)