Merge pull request #1497 from OneSignal/example/update_to_latest_versions

Update example project to latest Android dependencies; Gradle 7, AGP 7, etc

Author: jkasten2

Examples/OneSignalDemo/app/build.gradle

@@ -53,35 +53,32 @@ android {
 }
 
 dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
-
     implementation 'com.android.support:multidex:1.0.3'
-    implementation 'com.google.android.material:material:[1.0.0, 1.4.99]'
+    implementation 'com.google.android.material:material:1.4.0'
+    implementation 'androidx.cardview:cardview:1.0.0'
+    implementation 'androidx.appcompat:appcompat:1.4.0'
+    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
+    implementation 'androidx.vectordrawable:vectordrawable:1.1.0'
 
-    implementation 'androidx.cardview:cardview:[1.0.0, 1.99.99]'
-    implementation 'androidx.appcompat:appcompat:[1.0.0, 1.99.99]'
-    implementation 'androidx.legacy:legacy-support-v4:[1.0.0, 1.99.99]'
-    implementation 'androidx.vectordrawable:vectordrawable:[1.0.0, 1.99.99]'
-    // Test public release OneSignal SDK
-    // This will not work until 4.0.0 is publicly released because of manifest placeholders causing
-    //  manifest merger conflicts
-//    implementation 'com.onesignal:OneSignal:3.12.6'
+    implementation 'com.google.android.gms:play-services-location:18.0.0'
 
-    implementation 'com.google.android.gms:play-services-location:[17.0.0, 17.99.99]'
-    // glide:4.9.0 is the last version before going to AndroidX
-    // glide:4.10.0 is the first version using AndroidX
-    implementation 'com.github.bumptech.glide:glide:[4.10.0, 4.99.99]'
-    
-    // Test local OneSignal SDK
-    gmsImplementation(project(':onesignal'))
+    implementation 'com.github.bumptech.glide:glide:4.12.0'
 
-    huaweiImplementation 'com.huawei.hms:push:5.3.0.304'
-    huaweiImplementation 'com.huawei.hms:location:4.0.0.300'
+    /** START - Google Play Builds **/
+    gmsImplementation('com.onesignal:OneSignal:4.6.3')
+    /** END - Google Play Builds **/
+
+    /** START - Huawei Builds **/
     // Omit Google / Firebase libraries for Huawei builds.
-    huaweiImplementation(project(':onesignal')) {
+    huaweiImplementation('com.onesignal:OneSignal:4.6.3') {
         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'
         exclude group: 'com.google.firebase', module: 'firebase-messaging'
     }
-}
+    // Add HMS Push library
+    huaweiImplementation 'com.huawei.hms:push:5.3.0.304'
+    // Optionally add HMS location
+    huaweiImplementation 'com.huawei.hms:location:4.0.0.300'
+    /** END - Huawei Builds **/
+}

Examples/OneSignalDemo/build.gradle

@@ -3,14 +3,16 @@
 buildscript {
     repositories {
         google()
-        jcenter()
-        maven { url 'https://plugins.gradle.org/m2/'}
-        
+        mavenCentral()
+        gradlePluginPortal()
+        // Huawei maven
+        maven { url 'https://developer.huawei.com/repo/' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.0'
-        classpath 'com.google.gms:google-services:4.2.0'
-        classpath 'gradle.plugin.com.onesignal:onesignal-gradle-plugin:[0.11.0, 0.99.99]'
+        classpath 'com.android.tools.build:gradle:7.0.4'
+        classpath 'com.google.gms:google-services:4.3.10'
+        classpath 'gradle.plugin.com.onesignal:onesignal-gradle-plugin:[0.14.0, 0.99.99]'
+        classpath 'com.huawei.agconnect:agcp:1.2.1.301'
 
         // TODO: Do not place your application dependencies here; they belong
         //  in the individual module build.gradle files
@@ -20,9 +22,9 @@ buildscript {
 allprojects {
     repositories {
         google()
-        jcenter()
-        maven { url 'https://maven.google.com' }
-        
+        mavenCentral()
+        // Huawei maven
+        maven { url 'https://developer.huawei.com/repo/' }
     }
 }
 

Examples/OneSignalDemo/gradle.properties

@@ -1,13 +1,16 @@
-# Project-wide Gradle settings.
-# IDE (e.g. Android Studio) users:
-# Gradle settings configured through the IDE *will override*
-# any settings specified in this file.
-# For more details on how to configure your build environment visit
+## For more details on how to configure your build environment visit
 # http://www.gradle.org/docs/current/userguide/build_environment.html
+#
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
-org.gradle.jvmargs=-Xmx1536m
+# Default value: -Xmx1024m -XX:MaxPermSize=256m
+# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+#
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
+#Wed Dec 08 19:57:11 PST 2021
+org.gradle.jvmargs=-Xmx1536m
+android.useAndroidX=true
+android.enableJetifier=false

Examples/OneSignalDemo/gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,5 @@
-#Wed Sep 25 18:37:17 PDT 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip