diff --git a/Examples/OneSignalDemo/app/build.gradle b/Examples/OneSignalDemo/app/build.gradle index bef6ab719f..9b1ca75176 100644 --- a/Examples/OneSignalDemo/app/build.gradle +++ b/Examples/OneSignalDemo/app/build.gradle @@ -3,6 +3,7 @@ plugins { } android { + namespace 'com.onesignal.sdktest' compileSdkVersion 34 defaultConfig { minSdkVersion 21 @@ -61,10 +62,11 @@ android { } task flavorSelection() { - if (getGradle().getStartParameter().getTaskRequests().toString().contains("Gms")) { + def tasksList = gradle.startParameter.taskRequests.toString() + if (tasksList.contains('Gms')) { apply plugin: 'com.google.gms.google-services' googleServices { disableVersionCheck = true } - } else { + } else if (tasksList.contains('Huawei')) { apply plugin: 'com.huawei.agconnect' } } diff --git a/Examples/OneSignalDemo/app/src/main/AndroidManifest.xml b/Examples/OneSignalDemo/app/src/main/AndroidManifest.xml index 14d81d3f3d..c35bc26d81 100644 --- a/Examples/OneSignalDemo/app/src/main/AndroidManifest.xml +++ b/Examples/OneSignalDemo/app/src/main/AndroidManifest.xml @@ -1,8 +1,7 @@ + xmlns:amazon="http://schemas.amazon.com/apk/res/android"> diff --git a/Examples/OneSignalDemo/app/src/main/java/com/onesignal/sdktest/application/MainApplication.java b/Examples/OneSignalDemo/app/src/main/java/com/onesignal/sdktest/application/MainApplication.java index 06d70bfe09..75baf6720e 100644 --- a/Examples/OneSignalDemo/app/src/main/java/com/onesignal/sdktest/application/MainApplication.java +++ b/Examples/OneSignalDemo/app/src/main/java/com/onesignal/sdktest/application/MainApplication.java @@ -21,7 +21,6 @@ import com.onesignal.notifications.IDisplayableNotification; import com.onesignal.notifications.INotificationLifecycleListener; import com.onesignal.notifications.INotificationWillDisplayEvent; -import com.onesignal.sdktest.BuildConfig; import com.onesignal.sdktest.R; import com.onesignal.sdktest.constant.Tag; import com.onesignal.sdktest.constant.Text; @@ -39,9 +38,8 @@ public class MainApplication extends MultiDexApplication { private static final int SLEEP_TIME_TO_MIMIC_ASYNC_OPERATION = 2000; public MainApplication() { - // run strict mode default in debug mode to surface any potential issues easier - if(BuildConfig.DEBUG) - StrictMode.enableDefaults(); + // run strict mode to surface any potential issues easier + StrictMode.enableDefaults(); } @SuppressLint("NewApi") diff --git a/Examples/OneSignalDemo/build.gradle b/Examples/OneSignalDemo/build.gradle index 4ec0efa17f..2f8ab94ba0 100644 --- a/Examples/OneSignalDemo/build.gradle +++ b/Examples/OneSignalDemo/build.gradle @@ -12,9 +12,9 @@ buildscript { maven { url 'https://developer.huawei.com/repo/' } } dependencies { - classpath 'com.android.tools.build:gradle:7.2.2' + classpath 'com.android.tools.build:gradle:8.8.2' classpath 'com.google.gms:google-services:4.3.10' - classpath 'com.huawei.agconnect:agcp:1.6.2.300' + classpath 'com.huawei.agconnect:agcp:1.9.1.304' // TODO: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/Examples/OneSignalDemo/gradle/wrapper/gradle-wrapper.properties b/Examples/OneSignalDemo/gradle/wrapper/gradle-wrapper.properties index 669386b870..18330fcba8 100644 --- a/Examples/OneSignalDemo/gradle/wrapper/gradle-wrapper.properties +++ b/Examples/OneSignalDemo/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/OneSignalSDK/build.gradle b/OneSignalSDK/build.gradle index 6ce6d76119..dd2638f8a8 100644 --- a/OneSignalSDK/build.gradle +++ b/OneSignalSDK/build.gradle @@ -8,9 +8,9 @@ buildscript { targetSdkVersion: 34, minSdkVersion: 21 ] - androidGradlePluginVersion = '7.2.0' + androidGradlePluginVersion = '8.8.2' googleServicesGradlePluginVersion = '4.3.10' - huaweiAgconnectVersion = '1.6.2.300' + huaweiAgconnectVersion = '1.9.1.304' huaweiHMSPushVersion = '6.3.0.304' huaweiHMSLocationVersion = '4.0.0.300' kotlinVersion = '1.7.10' diff --git a/OneSignalSDK/gradle.properties b/OneSignalSDK/gradle.properties index 4a6e6ce6c0..b45ca2bbe2 100644 --- a/OneSignalSDK/gradle.properties +++ b/OneSignalSDK/gradle.properties @@ -23,9 +23,7 @@ # Remove when creating an .aar build. #android.enableAapt2=false -android.databinding.incremental = false -kapt.incremental.apt = false -android.testConfig.useRelativePath = false +org.gradle.jvmargs=-Xmx1536m # Enables D8 for all modules. android.enableD8 = true diff --git a/OneSignalSDK/gradle/wrapper/gradle-wrapper.properties b/OneSignalSDK/gradle/wrapper/gradle-wrapper.properties index 669386b870..18330fcba8 100644 --- a/OneSignalSDK/gradle/wrapper/gradle-wrapper.properties +++ b/OneSignalSDK/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/OneSignalSDK/onesignal/build.gradle b/OneSignalSDK/onesignal/build.gradle index 123970d38a..952c3dc5e9 100644 --- a/OneSignalSDK/onesignal/build.gradle +++ b/OneSignalSDK/onesignal/build.gradle @@ -1,5 +1,9 @@ plugins { id 'com.android.library' + // There isn't Kotlin or Java code in this top-level project, + // however consumers look for an .aar file, which this causes it + // to be created. + id 'kotlin-android' } android { @@ -25,6 +29,8 @@ android { targetCompatibility JavaVersion.VERSION_1_8 } namespace 'com.onesignal' + + kotlinOptions.freeCompilerArgs += ['-module-name', namespace] } ext { diff --git a/OneSignalSDK/onesignal/maven-push.gradle b/OneSignalSDK/onesignal/maven-push.gradle index ea2e91a46b..299c9fca8a 100644 --- a/OneSignalSDK/onesignal/maven-push.gradle +++ b/OneSignalSDK/onesignal/maven-push.gradle @@ -66,7 +66,9 @@ afterEvaluate { publications { release(MavenPublication) { - from components.release + afterEvaluate { + from components.findByName('release') + } pom { name = projectName diff --git a/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/display/impl/NotificationDisplayBuilder.kt b/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/display/impl/NotificationDisplayBuilder.kt index 2029c91084..6bcb1e8af4 100644 --- a/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/display/impl/NotificationDisplayBuilder.kt +++ b/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/display/impl/NotificationDisplayBuilder.kt @@ -12,7 +12,6 @@ import android.net.Uri import android.os.Build import androidx.core.app.NotificationCompat import com.onesignal.common.AndroidUtils -import com.onesignal.core.R import com.onesignal.core.internal.application.IApplicationService import com.onesignal.debug.internal.logging.Logging import com.onesignal.notifications.internal.bundle.impl.NotificationBundleProcessor @@ -231,9 +230,9 @@ internal class NotificationDisplayBuilder( if (bitmap == null) return null try { val systemLargeIconHeight = - contextResources!!.getDimension(R.dimen.notification_large_icon_height).toInt() + contextResources!!.getDimension(android.R.dimen.notification_large_icon_height).toInt() val systemLargeIconWidth = - contextResources!!.getDimension(R.dimen.notification_large_icon_width).toInt() + contextResources!!.getDimension(android.R.dimen.notification_large_icon_width).toInt() val bitmapHeight = bitmap.height val bitmapWidth = bitmap.width if (bitmapWidth > systemLargeIconWidth || bitmapHeight > systemLargeIconHeight) {