Merge pull request #1678 from OneSignal/user-model/gradle-modularization

[User Model] Modularize IAM/Notification/Location

Author: brismithers

Examples/OneSignalDemo/app/build.gradle

@@ -1,10 +1,12 @@
-apply plugin: 'com.android.application'
+plugins {
+    id 'com.android.application'
+}
 
 android {
-    compileSdkVersion 31
+    compileSdkVersion 33
     defaultConfig {
         minSdkVersion 16
-        targetSdkVersion 31
+        targetSdkVersion 33
         versionCode 1
         versionName "1.0"
         multiDexEnabled true
@@ -54,24 +56,28 @@ android {
 
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion"
-    implementation 'com.android.support:multidex:1.0.3'
-    implementation 'com.google.android.material:material:1.4.0'
+    implementation 'androidx.multidex:multidex:2.0.1'
     implementation 'androidx.cardview:cardview:1.0.0'
-    implementation 'androidx.appcompat:appcompat:1.4.0'
+    implementation 'androidx.appcompat:appcompat:1.5.1'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     implementation 'androidx.vectordrawable:vectordrawable:1.1.0'
 
-    implementation 'com.google.android.gms:play-services-location:18.0.0'
+    implementation 'com.google.android.material:material:1.7.0'
+    implementation 'com.google.android.gms:play-services-location:21.0.0'
 
     implementation 'com.github.bumptech.glide:glide:4.12.0'
 
+    implementation('com.onesignal:OneSignal:4.8.2')
+    implementation('com.onesignal:Location:4.8.2')
+    implementation('com.onesignal:IAM:4.8.2')
+
     /** START - Google Play Builds **/
-    gmsImplementation('com.onesignal:OneSignal:4.6.3')
+    gmsImplementation('com.onesignal:Notification:4.8.2')
     /** END - Google Play Builds **/
 
     /** START - Huawei Builds **/
     // Omit Google / Firebase libraries for Huawei builds.
-    huaweiImplementation('com.onesignal:OneSignal:4.6.3') {
+    huaweiImplementation('com.onesignal:Notification:4.8.2') {
         exclude group: 'com.google.android.gms', module: 'play-services-gcm'
         exclude group: 'com.google.android.gms', module: 'play-services-analytics'
         exclude group: 'com.google.android.gms', module: 'play-services-location'

Examples/OneSignalDemo/app/src/main/java/com/onesignal/sdktest/activity/MainActivity.java

@@ -6,7 +6,7 @@
 import androidx.annotation.RequiresApi;
 import androidx.appcompat.app.AppCompatActivity;
 
-import com.onesignal.core.OneSignal;
+import com.onesignal.OneSignal;
 import com.onesignal.sdktest.R;
 import com.onesignal.sdktest.model.MainActivityViewModel;
 

Examples/OneSignalDemo/app/src/main/java/com/onesignal/sdktest/application/MainApplication.java

@@ -7,12 +7,12 @@
 import androidx.annotation.Nullable;
 import androidx.multidex.MultiDexApplication;
 
-import com.onesignal.core.OneSignal;
+import com.onesignal.OneSignal;
 import com.onesignal.iam.IInAppMessage;
 import com.onesignal.iam.IInAppMessageAction;
 import com.onesignal.iam.IInAppMessageClickHandler;
 import com.onesignal.iam.IInAppMessageLifecycleHandler;
-import com.onesignal.core.debug.LogLevel;
+import com.onesignal.debug.LogLevel;
 import com.onesignal.notification.INotification;
 import com.onesignal.sdktest.BuildConfig;
 import com.onesignal.sdktest.R;

Examples/OneSignalDemo/app/src/main/java/com/onesignal/sdktest/model/MainActivityViewModel.java

@@ -24,12 +24,12 @@
 import android.widget.Switch;
 import android.widget.TextView;
 
-import com.onesignal.core.Continue;
-import com.onesignal.core.OneSignal;
+import com.onesignal.Continue;
+import com.onesignal.OneSignal;
 import com.onesignal.notification.IPermissionStateChanges;
-import com.onesignal.core.user.subscriptions.IEmailSubscription;
-import com.onesignal.core.user.subscriptions.IPushSubscription;
-import com.onesignal.core.user.subscriptions.ISmsSubscription;
+import com.onesignal.user.subscriptions.IEmailSubscription;
+import com.onesignal.user.subscriptions.IPushSubscription;
+import com.onesignal.user.subscriptions.ISmsSubscription;
 import com.onesignal.sdktest.R;
 import com.onesignal.sdktest.activity.SecondaryActivity;
 import com.onesignal.sdktest.adapter.InAppMessageRecyclerViewAdapter;

Examples/OneSignalDemo/app/src/main/java/com/onesignal/sdktest/model/SplashActivityViewModel.java

@@ -8,7 +8,7 @@
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
 
-import com.onesignal.core.OneSignal;
+import com.onesignal.OneSignal;
 import com.onesignal.notification.IPermissionStateChanges;
 import com.onesignal.sdktest.constant.Tag;
 import com.onesignal.sdktest.constant.Text;

Examples/OneSignalDemo/app/src/main/java/com/onesignal/sdktest/notification/NotificationServiceExtension.java

@@ -2,8 +2,8 @@
 
 import android.content.Context;
 
-import com.onesignal.core.debug.LogLevel;
-import com.onesignal.core.internal.logging.Logging;
+import com.onesignal.debug.LogLevel;
+import com.onesignal.debug.internal.logging.Logging;
 import com.onesignal.notification.IActionButton;
 import com.onesignal.notification.IMutableNotification;
 import com.onesignal.notification.INotification;

Examples/OneSignalDemo/app/src/main/java/com/onesignal/sdktest/notification/OneSignalNotificationSender.java

@@ -2,9 +2,9 @@
 
 import android.util.Log;
 
-import com.onesignal.core.Continue;
-import com.onesignal.core.OneSignal;
-import com.onesignal.core.user.subscriptions.IPushSubscription;
+import com.onesignal.Continue;
+import com.onesignal.OneSignal;
+import com.onesignal.user.subscriptions.IPushSubscription;
 import com.onesignal.sdktest.constant.Tag;
 import com.onesignal.sdktest.type.Notification;
 

OneSignalSDK/build.gradle

@@ -5,17 +5,19 @@ buildscript {
     ext {
         buildVersions = [
                 compileSdkVersion: 31,
-                targetSdkVersion: 31
+                targetSdkVersion: 31,
+                minSdkVersion: 16
         ]
-        androidGradlePluginVersion = '7.0.4'
+        androidGradlePluginVersion = '7.2.0'
         googleServicesGradlePluginVersion = '4.3.10'
         huaweiAgconnectVersion = '1.6.2.300'
         huaweiHMSPushVersion = '6.3.0.304'
         huaweiHMSLocationVersion = '4.0.0.300'
-        kotlinVersion = '1.6.21'
+        kotlinVersion = '1.7.10'
         kotestVersion = '5.5.0'
         ktlintVersion = '11.0.0'
         detektVersion = '1.21.0'
+        junitVersion = '4.13.2'
     }
 
     repositories {
@@ -30,7 +32,6 @@ buildscript {
         classpath "com.google.gms:google-services:$googleServicesGradlePluginVersion"
         classpath "com.huawei.agconnect:agcp:$huaweiAgconnectVersion"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
-
         classpath "org.jlleitschuh.gradle:ktlint-gradle:$ktlintVersion"
         classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:$detektVersion"
     }

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.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

OneSignalSDK/onesignal/build.gradle

@@ -1,22 +1,16 @@
-ext {
-    buildVersions = [
-            minSdkVersion: 16
-    ]
+plugins {
+    id 'com.android.library'
+    id 'kotlin-android'
+    id 'org.jlleitschuh.gradle.ktlint'
+    id 'io.gitlab.arturbosch.detekt'
 }
 
-apply plugin: 'com.android.library'
-apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
-apply plugin: 'org.jlleitschuh.gradle.ktlint'
-apply plugin: 'io.gitlab.arturbosch.detekt'
-
 android {
     compileSdkVersion rootProject.buildVersions.compileSdkVersion
     defaultConfig {
-        minSdkVersion buildVersions.minSdkVersion
-        consumerProguardFiles 'consumer-proguard-rules.pro'
+        minSdkVersion rootProject.buildVersions.minSdkVersion
+        consumerProguardFiles 'consumer-rules.pro'
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-        testOptions.unitTests.includeAndroidResources = true
     }
 
     buildTypes {
@@ -45,6 +39,10 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
+    kotlinOptions {
+        jvmTarget = '1.8'
+    }
+    namespace 'com.onesignal'
 }
 
 tasks.withType(Test) {
@@ -62,79 +60,26 @@ tasks.withType(Test) {
 //         make sure the latest minor value is a known stable version. Using a range for the
 //         patch version is ok, since this allows getting bug fix versions.
 dependencies {
-    compileOnly fileTree(dir: 'libs', include: ['*.jar'])
-    compileOnly('com.amazon.device:amazon-appstore-sdk:[3.0.1, 3.0.99]')
-
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4"
-    implementation 'androidx.work:work-runtime-ktx:2.7.1'
-
-    // play-services-location:16.0.0 is the last version before going to AndroidX
-    // play-services-location:17.0.0 is the first version using AndroidX
-    compileOnly('com.google.android.gms:play-services-location:[17.0.0, 18.0.99]') {
-        version {
-            require '[17.0.0, 18.0.99]'
-            prefer '18.0.0'
-        }
-    }
 
-    // play-services-base:16.1.0 is the last version before going to AndroidX
-    // play-services-base:17.0.0 is the first version using AndroidX
-    // Required for GoogleApiAvailability
-    implementation('com.google.android.gms:play-services-base') {
-        version {
-            require '[17.0.0, 17.6.99]'
-            prefer '17.6.0'
-        }
-    }
-
-    // firebase-messaging:18.0.0 is the last version before going to AndroidX
-    // firebase-messaging:19.0.0 is the first version using AndroidX
-    api('com.google.firebase:firebase-messaging') {
-        version {
-            require '[19.0.0, 22.0.99]'
-            prefer '22.0.0'
-        }
-    }
-
-    // Huawei PushKit
-    // KEEP as "compileOnly", so OneSignal isn't a direct dependency in the POM file.
-    compileOnly "com.huawei.hms:push:$huaweiHMSPushVersion"
-    compileOnly "com.huawei.hms:location:$huaweiHMSLocationVersion"
+    compileOnly('com.amazon.device:amazon-appstore-sdk:[3.0.1, 3.0.99]')
 
-    api('androidx.cardview:cardview') {
-        version {
-            require '[1.0.0, 1.0.99]'
-            prefer '1.0.0'
-        }
-    }
     api('androidx.legacy:legacy-support-v4') {
         version {
             require '[1.0.0, 1.0.99]'
             prefer '1.0.0'
         }
     }
-    api('androidx.browser:browser') {
-        version {
-            require '[1.0.0, 1.3.99]'
-            prefer '1.3.0'
-        }
-    }
     api('androidx.appcompat:appcompat') {
         version {
             require '[1.0.0, 1.3.99]'
             prefer '1.3.1'
         }
     }
-    api('androidx.work:work-runtime') {
-        version {
-            require '[2.1.0, 2.7.99]'
-            prefer '2.7.1'
-        }
-    }
 
-    testImplementation("junit:junit:4.13.2")
+    testImplementation("junit:junit:$junitVersion")
     testImplementation("io.kotest:kotest-runner-junit4:$kotestVersion")
     testImplementation("io.kotest:kotest-runner-junit4-jvm:$kotestVersion")
     testImplementation("io.kotest:kotest-assertions-core:$kotestVersion")
@@ -144,7 +89,7 @@ dependencies {
     testImplementation("androidx.test:core:1.4.0")
     testImplementation("io.mockk:mockk:1.13.2")
     testImplementation("org.json:json:20180813")
-    testImplementation "org.jetbrains.kotlin:kotlin-reflect:$kotlinVersion"
+    testImplementation("org.jetbrains.kotlin:kotlin-reflect:$kotlinVersion")
 }
 
 apply from: 'maven-push.gradle'