Merge pull request #1499 from OneSignal/upgrade-dev-env-2021-12

SDK Development Environment - Upgrade SDK to Gradle 7 and AGP 7

Author: jkasten2

.travis.yml

@@ -1,23 +1,35 @@
 language: android
 sudo: false
-jdk: oraclejdk8
+jdk: oraclejdk11
 dist: trusty
 
+env:
+  global:
+    - JAVA_TOOL_OPTIONS=-Dhttps.protocols=TLSv1.2
+    - ANDROID_HOME=/usr/local/android-sdk
+    - ANDROID_TOOLS=${ANDROID_HOME}/cmdline-tools/latest
+    - PATH=${ANDROID_HOME}:${ANDROID_HOME}/emulator:${ANDROID_TOOLS}:${ANDROID_TOOLS}/bin:${ANDROID_HOME}/platform-tools:${PATH}
+
 android:
   components:
     - tools
     - tools # Include again to work around travis not using the latest.
             # https://github.com/travis-ci/travis-ci/issues/6193
             # Required to get the newest platform-tools.
     - platform-tools
-    - build-tools-29.0.3
-    - android-29
+    - build-tools-31.0.0
+    - android-31
   licenses:
     - '.+'
     - 'android-sdk-license-.+'
 before_install:
-    - yes | sdkmanager "platforms;android-29"
-    - yes | sdkmanager "build-tools;29.0.3"
+    # Download newer Android tools that are compatible with Java 11
+    - wget -q "https://dl.google.com/android/repository/commandlinetools-linux-7583922_latest.zip" -O android-commandline-tools-linux.zip
+    - mkdir -p ${ANDROID_HOME}/cmdline-tools
+    - unzip -q android-commandline-tools-linux.zip -d ${ANDROID_HOME}/cmdline-tools
+    - mv ${ANDROID_HOME}/cmdline-tools/cmdline-tools ${ANDROID_HOME}/cmdline-tools/latest
+    - yes | ${ANDROID_TOOLS}/bin/sdkmanager "platforms;android-31"
+    - yes | ${ANDROID_TOOLS}/bin/sdkmanager "build-tools;31.0.0"
     - pwd
     - ls -la
     - cd OneSignalSDK

Examples/OneSignalDemo/app/build.gradle

@@ -77,7 +77,7 @@ dependencies {
         exclude group: 'com.google.firebase', module: 'firebase-messaging'
     }
     // Add HMS Push library
-    huaweiImplementation 'com.huawei.hms:push:5.3.0.304'
+    huaweiImplementation 'com.huawei.hms:push:6.1.0.300'
     // Optionally add HMS location
     huaweiImplementation 'com.huawei.hms:location:4.0.0.300'
     /** END - Huawei Builds **/

Examples/OneSignalDemo/build.gradle

@@ -12,7 +12,7 @@ buildscript {
         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'
+        classpath 'com.huawei.agconnect:agcp:1.6.2.300'
 
         // TODO: Do not place your application dependencies here; they belong
         //  in the individual module build.gradle files

OneSignalSDK/build.gradle

@@ -7,27 +7,27 @@ buildscript {
                 compileSdkVersion: 31,
                 targetSdkVersion: 31
         ]
-        androidGradlePluginVersion = '3.6.2'
-        googleServicesGradlePluginVersion = '4.3.2'
-        huaweiAgconnectVersion = '1.2.1.301'
-        huaweiHMSPushVersion = '5.3.0.304'
+        androidGradlePluginVersion = '7.0.4'
+        googleServicesGradlePluginVersion = '4.3.10'
+        huaweiAgconnectVersion = '1.6.2.300'
+        huaweiHMSPushVersion = '6.1.0.300'
         huaweiHMSLocationVersion = '4.0.0.300'
         kotlinVersion = '1.4.32'
-        onesignalGradlePluginVersion = '[0.12.6, 0.99.99]'
+        onesignalGradlePluginVersion = '[0.14.0, 0.99.99]'
     }
 
     repositories {
         google()
-        jcenter()
-        maven { url 'https://maven.google.com' }
+        mavenCentral()
 
         // OneSignal-Gradle-Plugin - Local testing
         // maven { url uri('../../repo') }
 
         // OneSignal-Gradle-Plugin - Public version
-        maven { url 'https://plugins.gradle.org/m2/' }
+        gradlePluginPortal()
+
         // Huawei maven
-        maven { url 'http://developer.huawei.com/repo/' }
+        maven { url 'https://developer.huawei.com/repo/' }
     }
     dependencies {
         classpath "com.android.tools.build:gradle:$androidGradlePluginVersion"
@@ -46,12 +46,11 @@ buildscript {
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
         flatDir {
             dirs 'libs'
         }
-        maven { url 'https://maven.google.com' }
         // Huawei maven
-        maven { url 'http://developer.huawei.com/repo/' }
+        maven { url 'https://developer.huawei.com/repo/' }
     }
-}
+}

OneSignalSDK/gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,5 @@
-#Wed Apr 15 11:26:10 PDT 2020
 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-6.1.1-all.zip