Skip to content

Commit

Permalink
Merge pull request #263 from mixpanel/zihe-upgrade-android
Browse files Browse the repository at this point in the history
upgrade android sdk to 7.5.3
  • Loading branch information
zihejia authored Sep 10, 2024
2 parents a7a1434 + 0617796 commit a50a830
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 13 deletions.
14 changes: 7 additions & 7 deletions .github/workflows/node.js.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
- run: npm test

test_android:
runs-on: macos-11
runs-on: macos-13
strategy:
matrix:
node-version: [18.x]
Expand All @@ -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
Expand Down
10 changes: 5 additions & 5 deletions android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ buildscript {
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:7.3.1'
classpath 'com.android.tools.build:gradle:8.1.0'
}
}

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

Expand All @@ -22,7 +22,7 @@ android {

defaultConfig {
minSdkVersion 21
targetSdkVersion 33
targetSdkVersion 34
versionCode 1
versionName "1.0"
}
Expand All @@ -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'
}
2 changes: 1 addition & 1 deletion android/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit a50a830

Please sign in to comment.