feat: upgrade to AGP 7.X

.github/workflows/cross-platform-tests.yml

@@ -4,23 +4,28 @@ on:
 jobs:
  cross-platform-tests:
  timeout-minutes: 30
- runs-on: macos-10.15
+ runs-on: macos-11
  steps:
- - name: Checkout cross platform test
+ - name: "Checkout cross platform test"
  uses: actions/checkout@v2
  with:
  token: ${{ secrets.ANDROID_GITHUB_PAT }} #medium-term solution, this needs to be an MParticle/non-personal PAT
  repository: mParticle/crossplatform-sdk-tests
- - name: Checkout internal
+ - name: "Checkout internal"
  uses: actions/checkout@v2
  with:
  path: .sdks/android
-
- - name: Start emulator
- run: cd .sdks/android; ./scripts/install-start-emulator.sh
- - name: Run Tests
- run: ./gradlew runAndroid
- - name: Archive Test Results
+ - name: "Install JDK 11"
+ uses: actions/setup-java@v2
+ with:
+ distribution: "zulu"
+ java-version: "11"
+ - name: "Run Crossplatform Tests"
+ uses: reactivecircus/[email protected]
+ with:
+ api-level: 29
+ script: ./gradlew runAndroid
+ - name: "Archive Test Results"
  if: ${{ always() }}
  uses: actions/upload-artifact@v2
  with:

.github/workflows/pull-request.yml

@@ -4,14 +4,20 @@ jobs:
  instrumented-tests:
  name: "Instrumented Tests"
  timeout-minutes: 30
- runs-on: macos-10.15
+ runs-on: macos-11
  steps:
  - name: "Checkout Branch"
  uses: actions/checkout@v2
- - name: "Start Emulator"
- run: ./scripts/install-start-emulator.sh
+ - name: "Install JDK 11"
+ uses: actions/setup-java@v2
+ with:
+ distribution: "zulu"
+ java-version: "11"
  - name: "Run Instrumented Tests"
- run: ./gradlew :android-core:cAT :android-kit-base:cAT --stacktrace
+ uses: reactivecircus/[email protected]
+ with:
+ api-level: 29
+ script: ./gradlew :android-core:cAT :android-kit-base:cAT --stacktrace
  - name: "Archive Test Results"
  uses: actions/upload-artifact@v2
  if: ${{ always() }}
@@ -25,10 +31,11 @@ jobs:
  steps:
  - name: "Checkout Branch"
  uses: actions/checkout@v2
- - name: "Install JDK 1.8"
- uses: actions/setup-java@v1
+ - name: "Install JDK 11"
+ uses: actions/setup-java@v2
  with:
- java-version: 1.8
+ distribution: "zulu"
+ java-version: "11"
  - name: "Run Unit Tests"
  run: ./gradlew test
  - name: "Android Test Report"
@@ -37,7 +44,7 @@ jobs:
  lint-checks:
  name: "Lint Checks"
  timeout-minutes: 15
- runs-on: macos-10.15
+ runs-on: macos-11
  steps:
  - name: "Checkout Branch"
  uses: actions/checkout@v2

.github/workflows/release.yml

@@ -47,18 +47,24 @@ jobs:
  name: "Instrumented Tests"
  timeout-minutes: 30
  needs: create-release-branch
- runs-on: macos-10.15
+ runs-on: macos-11
  steps:
  - name: "Checkout internal release branch"
  uses: actions/checkout@v2
  with:
  repository: mparticle/mparticle-android-sdk-internal
  token: ${{ secrets.MP_SEMANTIC_RELEASE_BOT }}
  ref: release/${{ github.run_number }}
- - name: "Start Emulator"
- run: ./scripts/install-start-emulator.sh
+ - name: "Install JDK 11"
+ uses: actions/setup-java@v2
+ with:
+ distribution: "zulu"
+ java-version: "11"
  - name: "Run Instrumented Tests"
- run: ./gradlew :android-core:cAT :android-kit-base:cAT --stacktrace
+ uses: reactivecircus/[email protected]
+ with:
+ api-level: 29
+ script: ./gradlew :android-core:cAT :android-kit-base:cAT --stacktrace
  - name: "Archive Instrumented Test Results"
  uses: actions/upload-artifact@v2
  if: ${{ always() }}
@@ -78,10 +84,11 @@ jobs:
  repository: mparticle/mparticle-android-sdk-internal
  token: ${{ secrets.MP_SEMANTIC_RELEASE_BOT }}
  ref: release/${{ github.run_number }}
- - name: "Install JDK 1.8"
- uses: actions/setup-java@v1
+ - name: "Install JDK 11"
+ uses: actions/setup-java@v2
  with:
- java-version: 1.8
+ distribution: "zulu"
+ java-version: "11"
  - name: "Run Unit Tests"
  run: ./gradlew test
  - name: "Android Test Report"
@@ -91,7 +98,7 @@ jobs:
  update-kits:
  name: "Update Kits"
  needs: [instrumented-tests, unit-tests]
- runs-on: macos-10.15
+ runs-on: macos-11
  env:
  GIT_AUTHOR_NAME: mparticle-bot
  GIT_AUTHOR_EMAIL: [email protected]
@@ -105,12 +112,17 @@ jobs:
  token: ${{ secrets.MP_SEMANTIC_RELEASE_BOT }}
  ref: release/${{ github.run_number }}
  submodules: recursive
+ - name: "Install JDK 11"
+ uses: actions/setup-java@v2
+ with:
+ distribution: "zulu"
+ java-version: "11"
  - name: "Build Android Core"
- run: ./gradlew -Ptarget_maven_repo=test -PisRelease=true cleanBuildCache clean testRelease publishReleaseLocal
+ run: ./gradlew -PisRelease=true clean publishReleaseLocal
  - name: "Update Kit references"
  run: git submodule foreach "git fetch; git reset --hard origin/master";
  - name: "Test Kits"
- run: ./gradlew -Ptarget_maven_repo=test -PisRelease=true cleanBuildCache clean testRelease publishReleaseLocal -c settings-kits.gradle
+ run: ./gradlew -PisRelease=true clean testRelease publishReleaseLocal -c settings-kits.gradle
  - name: "Commit Kit Updates"
  run: |
  git add .
@@ -121,7 +133,7 @@ jobs:
  semantic-release:
  name: "Semantic Release"
  needs: update-kits
- runs-on: macos-10.15
+ runs-on: macos-11
  env:
  GITHUB_TOKEN: ${{ secrets.MP_SEMANTIC_RELEASE_BOT }}
  GIT_AUTHOR_NAME: mparticle-bot
@@ -194,6 +206,11 @@ jobs:
  token: ${{ secrets.MP_SEMANTIC_RELEASE_BOT }}
  ref: release/${{ github.run_number }}
  submodules: recursive
+ - name: "Install JDK 11"
+ uses: actions/setup-java@v2
+ with:
+ distribution: "zulu"
+ java-version: "11"
  - name: "Publish Core, KitManager, KitPlugin"
  if: ${{ github.event.inputs.dryRun == 'false'}}
  run: |

android-core/build.gradle

@@ -54,6 +54,7 @@ android {
  buildConfigField 'String', 'MP_CONFIG_URL', configurationUrl
  buildConfigField 'Boolean', 'MP_DEBUG', 'false'
  buildConfigField 'String', 'SCHEME', '\"https\"'
+ buildConfigField 'String', 'VERSION_NAME', '\"' + versionName + '\"'
 
  testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
  if (useOrchestrator()) {
@@ -93,9 +94,6 @@ android {
  test.java.srcDirs += 'src/test/kotlin'
  androidTest.java.srcDirs += 'src/androidTest/kotlin'
  }
- dexOptions {
- javaMaxHeapSize "2g"
- }
 }
 
 task coreSdkJavadocs(type: Javadoc) {

android-kit-base/build.gradle

@@ -29,9 +29,6 @@ android {
  proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
  }
  }
- dexOptions {
- javaMaxHeapSize "2g"
- }
  sourceSets {
  androidTest.java.srcDirs += 'src/androidTest/kotlin'
  main.java.srcDirs += 'src/main/kotlin'

build.gradle

@@ -7,7 +7,7 @@ buildscript {
  maven { url 'https://dl.bintray.com/kotlin/kotlin-eap' }
  }
  dependencies {
- classpath 'com.android.tools.build:gradle:4.0.1'
+ classpath 'com.android.tools.build:gradle:7.0.2'
  classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
  }
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Tue Apr 03 15:57:13 EDT 2018
+#Mon Oct 04 12:58:48 PDT 2021
 distributionBase=GRADLE_USER_HOME
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
 distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-all.zip
+zipStoreBase=GRADLE_USER_HOME

kit-plugin/build.gradle

@@ -13,8 +13,8 @@ dependencies {
 }
 
 compileGroovy {
- sourceCompatibility = '1.8'
- targetCompatibility = '1.8'
+ sourceCompatibility = JavaVersion.VERSION_1_8
+ targetCompatibility = JavaVersion.VERSION_1_8
 }
 
 dependencies {

kit-plugin/src/main/groovy/com/mparticle/kits/KitPlugin.groovy

@@ -1,12 +1,8 @@
 package com.mparticle.kits
 import com.android.build.gradle.LibraryExtension
-import org.gradle.api.Action
 import org.gradle.api.Plugin
 import org.gradle.api.Project
-import org.gradle.api.artifacts.dsl.RepositoryHandler
-import org.gradle.api.publish.PublicationContainer
 import org.gradle.api.publish.PublishingExtension
-import org.gradle.api.publish.internal.DefaultPublishingExtension
 import org.gradle.api.publish.maven.MavenPublication
 import org.gradle.plugins.signing.SigningExtension
 
@@ -33,12 +29,13 @@ class KitPlugin implements Plugin<Project> {
  LibraryExtension androidLib = target.android
  androidLib.compileSdkVersion(30)
  androidLib.buildToolsVersion('30.0.3')
- androidLib.defaultConfig.versionCode = Integer.parseInt(new Date().format('yyyyMMdd'))
+ int dateInt = Integer.parseInt(new Date().format('yyyyMMdd'))
+ androidLib.defaultConfig.versionCode = dateInt
  androidLib.defaultConfig.minSdkVersion 14
  androidLib.defaultConfig.targetSdkVersion 30
+ androidLib.defaultConfig.buildConfigField("String", "VERSION_CODE", '\"' + dateInt + '\"')
  androidLib.buildTypes.release.minifyEnabled false
  androidLib.buildTypes.release.consumerProguardFiles 'consumer-proguard.pro'
- androidLib.dexOptions.javaMaxHeapSize '2g'
  androidLib.lintOptions.abortOnError true
 
  //formerly in maven.gradle

testutils/build.gradle

@@ -43,9 +43,6 @@ android {
  sourceSets {
  main.java.srcDirs += 'src/main/kotlin'
  }
- dexOptions {
- javaMaxHeapSize "2g"
- }
 }
 
 dependencies {

tooling/android-plugin/build.gradle

@@ -1,8 +1,8 @@
 apply plugin: 'groovy'
 apply plugin: 'kotlin'
 
-sourceCompatibility = 1.8
-targetCompatibility = 1.8
+sourceCompatibility = JavaVersion.VERSION_1_8
+targetCompatibility = JavaVersion.VERSION_1_8
 
 
 ext {

tooling/custom-lint-rules/build.gradle

@@ -13,7 +13,7 @@ buildscript {
  }
  dependencies {
  classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
- classpath 'com.guardsquare:proguard-gradle:7.0.0'
+ classpath 'com.guardsquare:proguard-gradle:7.1.0'
  }
 }