From ec4dea59ea76a002b1f23f1671d011f17fe5f2ab Mon Sep 17 00:00:00 2001 From: Zihe Jia Date: Mon, 9 Sep 2024 22:15:08 -0700 Subject: [PATCH 1/2] upgrade android sdk to 7.5.3 --- .github/workflows/node.js.yml | 14 +++++++------- android/build.gradle | 8 ++++---- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index f00fb762..e0ceaa0d 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -27,7 +27,7 @@ jobs: - run: npm test test_android: - runs-on: macos-11 + runs-on: macos-13 strategy: matrix: node-version: [18.x] @@ -51,18 +51,18 @@ jobs: working-directory: ./Samples/SimpleMixpanel run: yarn install - name: Setup Android - uses: reactivecircus/android-emulator-runner@v2.20.0 + uses: reactivecircus/android-emulator-runner@v2.32.0 with: - api-level: 30 - profile: Nexus 6 + api-level: 34 + profile: Nexus 5X arch: x86_64 working-directory: ./Samples/SimpleMixpanel/android script: ./gradlew - name: Test Android - uses: reactivecircus/android-emulator-runner@v2.20.0 + uses: reactivecircus/android-emulator-runner@v2.32.0 with: - api-level: 30 - profile: Nexus 6 + api-level: 34 + profile: Nexus 5X arch: x86_64 working-directory: ./Samples/SimpleMixpanel script: react-native run-android diff --git a/android/build.gradle b/android/build.gradle index 3e0425a1..042657bf 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -11,8 +11,8 @@ buildscript { apply plugin: 'com.android.library' android { - compileSdkVersion 33 - buildToolsVersion "30.0.3" + compileSdkVersion 34 + buildToolsVersion "34.0.0" def agpVersion = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION @@ -22,7 +22,7 @@ android { defaultConfig { minSdkVersion 21 - targetSdkVersion 33 + targetSdkVersion 34 versionCode 1 versionName "1.0" } @@ -41,5 +41,5 @@ repositories { dependencies { implementation 'com.facebook.react:react-native:+' - implementation 'com.mixpanel.android:mixpanel-android:7.5.2' + implementation 'com.mixpanel.android:mixpanel-android:7.5.3' } From 0617796b313a9353bae4ac16586e821cda2d5813 Mon Sep 17 00:00:00 2001 From: Zihe Jia Date: Mon, 9 Sep 2024 22:59:12 -0700 Subject: [PATCH 2/2] wip --- android/build.gradle | 2 +- android/gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index 042657bf..b5116ced 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -4,7 +4,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:7.3.1' + classpath 'com.android.tools.build:gradle:8.1.0' } } diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index 2ba538ab..1610ddbf 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.5-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-all.zip