Skip to content

Commit 19b15b7

Browse files
Mansi-mParticleMansi-mParticle
authored
feat: Update Android Gradle plugin to 8.0.2 (#61)
1 parent a9f95a4 commit 19b15b7

9 files changed

Lines changed: 114 additions & 66 deletions

File tree

‎build.gradle‎

Lines changed: 27 additions & 4 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
}
@@ -9,16 +9,17 @@ buildscript {
99
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,8 +31,30 @@ 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'
36+
37+
android {
38+
namespace 'com.mparticle.kits.skyhook'
39+
buildFeatures {
40+
buildConfig = true
41+
}
42+
defaultConfig {
43+
minSdkVersion 21
44+
}
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+
}
57+
}
3558

3659
dependencies {
3760
api fileTree(dir: 'libs', include: ['*.jar'])

‎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 & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
<manifest package="com.mparticle.kits.skyhook" xmlns:android="http://schemas.android.com/apk/res/android">
2-
1+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
32
<uses-permission android:name="android.permission.INTERNET" />
43
<uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
54
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />

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

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,20 @@ import android.content.Intent
77
import com.mparticle.kits.SkyhookLog.e
88
import com.mparticle.kits.SkyhookLog.i
99
import com.skyhookwireless.accelerator.AcceleratorClient
10-
import com.skyhookwireless.accelerator.AcceleratorClient.*
10+
import com.skyhookwireless.accelerator.AcceleratorClient.ConnectionCallbacks
11+
import com.skyhookwireless.accelerator.AcceleratorClient.OnConnectionFailedListener
12+
import com.skyhookwireless.accelerator.AcceleratorClient.OnRegisterForCampaignMonitoringResultListener
1113
import com.skyhookwireless.accelerator.AcceleratorStatusCodes
1214

13-
class SkyhookBootReceiver : BroadcastReceiver(), ConnectionCallbacks, OnConnectionFailedListener,
15+
class SkyhookBootReceiver :
16+
BroadcastReceiver(),
17+
ConnectionCallbacks,
18+
OnConnectionFailedListener,
1419
OnRegisterForCampaignMonitoringResultListener {
15-
override fun onReceive(context: Context, intent: Intent) {
20+
override fun onReceive(
21+
context: Context,
22+
intent: Intent,
23+
) {
1624
val apiKey = SkyhookPreferences(context).apiKey
1725
if (apiKey == null || apiKey == "") {
1826
e("not resuming monitoring after reboot")
@@ -26,14 +34,14 @@ class SkyhookBootReceiver : BroadcastReceiver(), ConnectionCallbacks, OnConnecti
2634
context,
2735
0,
2836
serviceIntent,
29-
PendingIntent.FLAG_MUTABLE
37+
PendingIntent.FLAG_MUTABLE,
3038
)
3139
} else {
3240
PendingIntent.getService(
3341
context,
3442
0,
3543
serviceIntent,
36-
PendingIntent.FLAG_UPDATE_CURRENT
44+
PendingIntent.FLAG_UPDATE_CURRENT,
3745
)
3846
}
3947
i("resuming monitoring after reboot")
@@ -42,16 +50,19 @@ class SkyhookBootReceiver : BroadcastReceiver(), ConnectionCallbacks, OnConnecti
4250
}
4351

4452
override fun onConnected() {}
53+
4554
override fun onDisconnected() {}
55+
4656
override fun onConnectionFailed(errorCode: Int) {}
57+
4758
override fun onRegisterForCampaignMonitoringResult(
4859
statusCode: Int,
49-
pendingIntent: PendingIntent
60+
pendingIntent: PendingIntent,
5061
) {
5162
if (statusCode == AcceleratorStatusCodes.SUCCESS) {
5263
i("resumed monitoring after reboot")
5364
} else {
5465
e("failed to resume monitoring after reboot: $statusCode")
5566
}
5667
}
57-
}
68+
}

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

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

3-
import com.mparticle.kits.SkyhookLog.i
4-
import com.mparticle.kits.SkyhookLog.e
53
import android.app.IntentService
64
import android.content.Intent
7-
import com.skyhookwireless.accelerator.CampaignVenue
8-
import com.skyhookwireless.accelerator.AcceleratorClient
95
import com.mparticle.kits.SkyhookLog
6+
import com.mparticle.kits.SkyhookLog.e
7+
import com.mparticle.kits.SkyhookLog.i
8+
import com.skyhookwireless.accelerator.AcceleratorClient
9+
import com.skyhookwireless.accelerator.CampaignVenue
1010

1111
class SkyhookIntentService : IntentService("com.mparticle.kits.SkyhookIntentService") {
1212
override fun onHandleIntent(intent: Intent?) {
1313
val campaignVenue = AcceleratorClient.getTriggeringCampaignVenue(intent)
1414
if (campaignVenue != null) {
1515
when (AcceleratorClient.getCampaignVenueTransition(intent)) {
16-
CampaignVenue.CAMPAIGN_VENUE_TRANSITION_ENTER -> i(
17-
"entered: $campaignVenue"
18-
)
16+
CampaignVenue.CAMPAIGN_VENUE_TRANSITION_ENTER ->
17+
i(
18+
"entered: $campaignVenue",
19+
)
1920
CampaignVenue.CAMPAIGN_VENUE_TRANSITION_EXIT -> i("exited: $campaignVenue")
2021
else -> e("unknown trigger type: $campaignVenue")
2122
}
@@ -25,4 +26,4 @@ class SkyhookIntentService : IntentService("com.mparticle.kits.SkyhookIntentServ
2526
e("unknown intent type: $intent")
2627
}
2728
}
28-
}
29+
}

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

Lines changed: 47 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -9,44 +9,53 @@ import android.os.Bundle
99
import com.mparticle.internal.MPUtility
1010
import com.mparticle.kits.KitIntegration.ActivityListener
1111
import com.skyhookwireless.accelerator.AcceleratorClient
12-
import com.skyhookwireless.accelerator.AcceleratorClient.*
12+
import com.skyhookwireless.accelerator.AcceleratorClient.ConnectionCallbacks
13+
import com.skyhookwireless.accelerator.AcceleratorClient.OnConnectionFailedListener
14+
import com.skyhookwireless.accelerator.AcceleratorClient.OnRegisterForCampaignMonitoringResultListener
15+
import com.skyhookwireless.accelerator.AcceleratorClient.OnStartCampaignMonitoringResultListener
16+
import com.skyhookwireless.accelerator.AcceleratorClient.OnStopCampaignMonitoringResultListener
1317
import com.skyhookwireless.accelerator.AcceleratorStatusCodes
1418

15-
class SkyhookKit : KitIntegration(), ActivityListener, ConnectionCallbacks,
16-
OnConnectionFailedListener, OnRegisterForCampaignMonitoringResultListener,
17-
OnStartCampaignMonitoringResultListener, OnStopCampaignMonitoringResultListener {
18-
private var _client: AcceleratorClient? = null
19-
private var _isInitialized = false
20-
private var _isRegistered = false
21-
private var _preferences: SkyhookPreferences? = null
19+
class SkyhookKit :
20+
KitIntegration(),
21+
ActivityListener,
22+
ConnectionCallbacks,
23+
OnConnectionFailedListener,
24+
OnRegisterForCampaignMonitoringResultListener,
25+
OnStartCampaignMonitoringResultListener,
26+
OnStopCampaignMonitoringResultListener {
27+
private var client: AcceleratorClient? = null
28+
private var isInitialized = false
29+
private var isRegistered = false
30+
private var preferences: SkyhookPreferences? = null
2231

2332
override fun getName(): String = KIT_NAME
2433

2534
override fun onKitCreate(
2635
settings: Map<String, String>,
27-
context: Context
36+
context: Context,
2837
): List<ReportingMessage> {
2938
SkyhookLog.d(ON_KIT_CREATE)
3039
val apiKey = settings[API_KEY]
31-
_preferences = SkyhookPreferences(context)
32-
_preferences?.apiKey = apiKey
33-
_client = AcceleratorClient(context, apiKey, this, this)
34-
SkyhookLog.i(ACCELERATOR_SDK_VERSION + _client?.version)
40+
preferences = SkyhookPreferences(context)
41+
preferences?.apiKey = apiKey
42+
client = AcceleratorClient(context, apiKey, this, this)
43+
SkyhookLog.i(ACCELERATOR_SDK_VERSION + client?.version)
3544
initialize()
3645
return emptyList()
3746
}
3847

3948
override fun onKitDestroy() {
4049
SkyhookLog.d(ON_KIT_DESTROY_MESSAGE)
4150
shutdown()
42-
_preferences?.clearApiKey()
51+
preferences?.clearApiKey()
4352
SkyhookLog.d(DESTROYED_MESSAGE)
4453
}
4554

4655
override fun onSettingsUpdated(settings: Map<String, String>) {
4756
SkyhookLog.d(ON_SETTINGS_UPDATED_MESSAGE)
4857
val newApiKey = settings[API_KEY]
49-
when (_preferences?.apiKey) {
58+
when (preferences?.apiKey) {
5059
null -> {
5160
SkyhookLog.i(NOT_RUNNING_MESSAGE)
5261
}
@@ -56,7 +65,7 @@ class SkyhookKit : KitIntegration(), ActivityListener, ConnectionCallbacks,
5665
else -> {
5766
SkyhookLog.i(SHUTTING_DOWN_CHANGED_KEY_MESSAGE)
5867
shutdown()
59-
_preferences!!.clearApiKey()
68+
preferences!!.clearApiKey()
6069
}
6170
}
6271
}
@@ -65,7 +74,7 @@ class SkyhookKit : KitIntegration(), ActivityListener, ConnectionCallbacks,
6574

6675
override fun onConnected() {
6776
SkyhookLog.d(CONNECTED_MESSAGE)
68-
_client?.registerForCampaignMonitoring(getServiceIntent(context), this)
77+
client?.registerForCampaignMonitoring(getServiceIntent(context), this)
6978
}
7079

7180
override fun onDisconnected() {
@@ -78,19 +87,19 @@ class SkyhookKit : KitIntegration(), ActivityListener, ConnectionCallbacks,
7887

7988
override fun onRegisterForCampaignMonitoringResult(
8089
statusCode: Int,
81-
pendingIntent: PendingIntent
90+
pendingIntent: PendingIntent,
8291
) {
8392
if (statusCode == AcceleratorStatusCodes.SUCCESS) {
84-
_isRegistered = true
85-
_client?.startMonitoringForAllCampaigns(this)
93+
isRegistered = true
94+
client?.startMonitoringForAllCampaigns(this)
8695
} else {
8796
SkyhookLog.e("failed to register: $statusCode")
8897
}
8998
}
9099

91100
override fun onStartCampaignMonitoringResult(
92101
statusCode: Int,
93-
campaignName: String
102+
campaignName: String,
94103
) {
95104
if (statusCode == AcceleratorStatusCodes.SUCCESS) {
96105
SkyhookLog.i("monitoring started")
@@ -101,7 +110,7 @@ class SkyhookKit : KitIntegration(), ActivityListener, ConnectionCallbacks,
101110

102111
override fun onStopCampaignMonitoringResult(
103112
statusCode: Int,
104-
campaignName: String
113+
campaignName: String,
105114
) {
106115
if (statusCode == AcceleratorStatusCodes.SUCCESS) {
107116
SkyhookLog.i("monitoring stopped")
@@ -110,8 +119,10 @@ class SkyhookKit : KitIntegration(), ActivityListener, ConnectionCallbacks,
110119
}
111120
}
112121

113-
override fun onActivityCreated(activity: Activity, bundle: Bundle?): List<ReportingMessage> =
114-
emptyList()
122+
override fun onActivityCreated(
123+
activity: Activity,
124+
bundle: Bundle?,
125+
): List<ReportingMessage> = emptyList()
115126

116127
override fun onActivityStarted(activity: Activity): List<ReportingMessage> = emptyList()
117128

@@ -133,39 +144,39 @@ class SkyhookKit : KitIntegration(), ActivityListener, ConnectionCallbacks,
133144

134145
override fun onActivitySaveInstanceState(
135146
activity: Activity,
136-
bundle: Bundle?
147+
bundle: Bundle?,
137148
): List<ReportingMessage> = emptyList()
138149

139150
override fun onActivityDestroyed(activity: Activity): List<ReportingMessage> = emptyList()
140151

141152
private fun initialize() {
142-
if (_client == null || _isInitialized) {
153+
if (client == null || isInitialized) {
143154
return
144155
}
145156
if (MPUtility.checkPermission(context, Manifest.permission.ACCESS_FINE_LOCATION)) {
146157
SkyhookLog.i(LOCATION_PERMISSION_GRANTED_MESSAGE)
147-
_client?.connect()
148-
_isInitialized = true
158+
client?.connect()
159+
isInitialized = true
149160
} else {
150161
SkyhookLog.i(LOCATION_PERMISSION_NOT_GRANTED_MESSAGE)
151162
}
152163
}
153164

154165
private fun shutdown() {
155-
_client?.let { _client ->
156-
if (_client.isConnected) {
166+
client?.let { client ->
167+
if (client.isConnected) {
157168
return
158-
} else if (_isRegistered) {
159-
_client.stopMonitoringForAllCampaigns(this)
169+
} else if (isRegistered) {
170+
client.stopMonitoringForAllCampaigns(this)
160171
}
161-
_client.disconnect()
172+
client.disconnect()
162173
} ?: return
163174
}
164175

165176
companion object {
166177
private const val API_KEY = "apiKey"
167178
private const val KIT_NAME = "Skyhook"
168-
private const val NOT_RUNNING_MESSAGE ="not running"
179+
private const val NOT_RUNNING_MESSAGE = "not running"
169180
private const val ON_KIT_CREATE = "onKitCreate"
170181
private const val ACCELERATOR_SDK_VERSION = "Accelerator SDK v"
171182
private const val ON_KIT_DESTROY_MESSAGE = "onKitDestroy"
@@ -187,14 +198,14 @@ class SkyhookKit : KitIntegration(), ActivityListener, ConnectionCallbacks,
187198
context,
188199
0,
189200
serviceIntent,
190-
PendingIntent.FLAG_MUTABLE
201+
PendingIntent.FLAG_MUTABLE,
191202
)
192203
} else {
193204
PendingIntent.getService(
194205
context,
195206
0,
196207
serviceIntent,
197-
PendingIntent.FLAG_UPDATE_CURRENT
208+
PendingIntent.FLAG_UPDATE_CURRENT,
198209
)
199210
}
200211
return pendingIntent

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import com.mparticle.MParticle
55

66
internal object SkyhookLog {
77
private const val TAG = "mParticle Skyhook Kit"
8+
89
fun d(msg: String) {
910
if (isEnabled) {
1011
Log.d(TAG, msg)
@@ -26,5 +27,5 @@ internal object SkyhookLog {
2627
}
2728

2829
private val isEnabled: Boolean
29-
get() = MParticle.getInstance()!!.environment == MParticle.Environment.Development
30+
get() = MParticle.getInstance()!!.environment == MParticle.Environment.Development
3031
}

0 commit comments

Comments
 (0)