Skip to content

Commit a507911

Browse files
authored
Merge pull request #2403 from OneSignal/kotlin1.9-update
chore: Kotlin 1.9 update
2 parents 125da89 + 64d477f commit a507911

File tree

4 files changed

+6
-3
lines changed

4 files changed

+6
-3
lines changed

Examples/OneSignalDemo/app/build.gradle

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,10 @@ android {
6464
}
6565
}
6666

67+
kotlinOptions {
68+
jvmTarget = '1.8'
69+
}
70+
6771
// Forced downgrade to Java 1.8 for compiling the application due to Android N error when building
6872
compileOptions {
6973
sourceCompatibility JavaVersion.VERSION_1_8

OneSignalSDK/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ buildscript {
1414
huaweiAgconnectVersion = '1.9.1.304'
1515
huaweiHMSPushVersion = '6.3.0.304'
1616
huaweiHMSLocationVersion = '4.0.0.300'
17-
kotlinVersion = '1.7.10'
17+
kotlinVersion = '1.9.25'
1818
coroutinesVersion = '1.7.3'
1919
kotestVersion = '5.8.0'
2020
ioMockVersion = '1.13.2'

OneSignalSDK/onesignal/location/src/test/java/com/onesignal/location/shadows/ShadowGoogleApiClient.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ class ShadowGoogleApiClient : GoogleApiClient() {
6363
connected = true
6464
}
6565

66-
override fun <C : Api.Client?> getClient(p0: Api.AnyClientKey<C>): C {
66+
override fun <C : Api.Client> getClient(p0: Api.AnyClientKey<C>): C {
6767
return object : Api.Client {
6868
override fun connect(p0: BaseGmsClient.ConnectionProgressReportCallbacks) { }
6969

OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/registration/impl/PushRegistratorHMS.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ internal class PushRegistratorHMS(
4747
return result!!
4848
}
4949

50-
@Synchronized
5150
@Throws(ApiException::class)
5251
private suspend fun getHMSTokenTask(context: Context): IPushRegistrator.RegisterResult {
5352
// Check required to prevent AGConnectServicesConfig or HmsInstanceId used below

0 commit comments

Comments
 (0)