Skip to content

Commit 9f7f9a0

Browse files
authored
Merge pull request #1844 from OneSignal/rename-kotlin-modules
[Fix] Rename kotlin modules
2 parents fea6fa1 + 545e5cd commit 9f7f9a0

File tree

5 files changed

+9
-1
lines changed

5 files changed

+9
-1
lines changed

OneSignalSDK/onesignal/core/build.gradle

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@ android {
4242
jvmTarget = '1.8'
4343
}
4444
namespace 'com.onesignal.core'
45+
46+
kotlinOptions.freeCompilerArgs += ['-module-name', namespace]
4547
}
4648

4749
tasks.withType(Test) {

OneSignalSDK/onesignal/in-app-messages/build.gradle

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@ android {
4242
jvmTarget = '1.8'
4343
}
4444
namespace 'com.onesignal.inAppMessages'
45+
46+
kotlinOptions.freeCompilerArgs += ['-module-name', namespace]
4547
}
4648

4749
tasks.withType(Test) {

OneSignalSDK/onesignal/location/build.gradle

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@ android {
4242
jvmTarget = '1.8'
4343
}
4444
namespace 'com.onesignal.location'
45+
46+
kotlinOptions.freeCompilerArgs += ['-module-name', namespace]
4547
}
4648

4749
tasks.withType(Test) {

OneSignalSDK/onesignal/notifications/build.gradle

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@ android {
4242
jvmTarget = '1.8'
4343
}
4444
namespace 'com.onesignal.notifications'
45+
46+
kotlinOptions.freeCompilerArgs += ['-module-name', namespace]
4547
}
4648

4749
tasks.withType(Test) {

OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/generation/impl/NotificationGenerationProcessor.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ internal class NotificationGenerationProcessor(
116116
}.join()
117117
}
118118
} catch (to: TimeoutCancellationException) {
119-
Logging.error("notificationWillShowInForegroundHandler timed out, continuing with wantsToDisplay=$wantsToDisplay.", to)
119+
Logging.info("notificationWillShowInForegroundHandler timed out, continuing with wantsToDisplay=$wantsToDisplay.", to)
120120
} catch (t: Throwable) {
121121
Logging.error("notificationWillShowInForegroundHandler threw an exception. Displaying normal OneSignal notification.", t)
122122
}

0 commit comments

Comments
 (0)