Skip to content

Commit 07c48cb

Browse files
authored
Merge pull request #161 from mixpanel/zihe-bump-android-sdk
Upgrade minSDK to 23
2 parents a0445d8 + bdf03aa commit 07c48cb

File tree

5 files changed

+60
-30
lines changed

5 files changed

+60
-30
lines changed

.github/workflows/flutter.yml

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,13 @@ jobs:
2222
- run: flutter analyze --no-pub --no-current-package lib
2323

2424
test-android-integration:
25-
runs-on: macos-11
25+
runs-on: macos-13
2626
steps:
27-
- uses: actions/checkout@v2
28-
- uses: actions/setup-java@v1
27+
- uses: actions/checkout@v4
28+
- uses: actions/setup-java@v4
2929
with:
30-
java-version: "12.x"
30+
java-version: "17"
31+
distribution: 'temurin'
3132
- uses: subosito/flutter-action@v1
3233
with:
3334
flutter-version: "3.16.0"
@@ -38,10 +39,11 @@ jobs:
3839
test-ios-integration:
3940
runs-on: macos-latest
4041
steps:
41-
- uses: actions/checkout@v2
42-
- uses: actions/setup-java@v1
42+
- uses: actions/checkout@v4
43+
- uses: actions/setup-java@v4
4344
with:
44-
java-version: "12.x"
45+
java-version: "17"
46+
distribution: 'temurin'
4547
- uses: subosito/flutter-action@v1
4648
with:
4749
flutter-version: "3.16.0"

.vscode/settings.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"java.compile.nullAnalysis.mode": "automatic",
3+
"java.configuration.updateBuildConfiguration": "interactive"
4+
}

android/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,12 @@ android {
3232
buildToolsVersion '34.0.0'
3333

3434
defaultConfig {
35-
minSdkVersion 21
35+
minSdkVersion 23
3636
}
3737

3838
compileOptions {
39-
sourceCompatibility JavaVersion.VERSION_1_8
40-
targetCompatibility JavaVersion.VERSION_1_8
39+
sourceCompatibility JavaVersion.VERSION_17
40+
targetCompatibility JavaVersion.VERSION_17
4141
}
4242

4343
lintOptions {
@@ -47,5 +47,5 @@ android {
4747

4848
dependencies {
4949
// Use the Mixpanel Android SDK
50-
implementation "com.mixpanel.android:mixpanel-android:7.5.0"
50+
implementation "com.mixpanel.android:mixpanel-android:7.5.3"
5151
}

example/android/app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ android {
4545
applicationId "com.example.mixpanel_example"
4646
// You can update the following values to match your application needs.
4747
// For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
48-
minSdkVersion flutter.minSdkVersion
49-
targetSdkVersion flutter.targetSdkVersion
48+
minSdkVersion 23
49+
targetSdkVersion 34
5050
versionCode flutterVersionCode.toInteger()
5151
versionName flutterVersionName
5252
}

example/pubspec.lock

Lines changed: 41 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -80,45 +80,69 @@ packages:
8080
url: "https://pub.dev"
8181
source: hosted
8282
version: "0.7.1"
83+
leak_tracker:
84+
dependency: transitive
85+
description:
86+
name: leak_tracker
87+
sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a"
88+
url: "https://pub.dev"
89+
source: hosted
90+
version: "10.0.4"
91+
leak_tracker_flutter_testing:
92+
dependency: transitive
93+
description:
94+
name: leak_tracker_flutter_testing
95+
sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8"
96+
url: "https://pub.dev"
97+
source: hosted
98+
version: "3.0.3"
99+
leak_tracker_testing:
100+
dependency: transitive
101+
description:
102+
name: leak_tracker_testing
103+
sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3"
104+
url: "https://pub.dev"
105+
source: hosted
106+
version: "3.0.1"
83107
matcher:
84108
dependency: transitive
85109
description:
86110
name: matcher
87-
sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e"
111+
sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb
88112
url: "https://pub.dev"
89113
source: hosted
90-
version: "0.12.16"
114+
version: "0.12.16+1"
91115
material_color_utilities:
92116
dependency: transitive
93117
description:
94118
name: material_color_utilities
95-
sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41"
119+
sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a"
96120
url: "https://pub.dev"
97121
source: hosted
98-
version: "0.5.0"
122+
version: "0.8.0"
99123
meta:
100124
dependency: transitive
101125
description:
102126
name: meta
103-
sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e
127+
sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136"
104128
url: "https://pub.dev"
105129
source: hosted
106-
version: "1.10.0"
130+
version: "1.12.0"
107131
mixpanel_flutter:
108132
dependency: "direct main"
109133
description:
110134
path: ".."
111135
relative: true
112136
source: path
113-
version: "2.3.0"
137+
version: "2.3.1"
114138
path:
115139
dependency: transitive
116140
description:
117141
name: path
118-
sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917"
142+
sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af"
119143
url: "https://pub.dev"
120144
source: hosted
121-
version: "1.8.3"
145+
version: "1.9.0"
122146
sky_engine:
123147
dependency: transitive
124148
description: flutter
@@ -168,10 +192,10 @@ packages:
168192
dependency: transitive
169193
description:
170194
name: test_api
171-
sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b"
195+
sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f"
172196
url: "https://pub.dev"
173197
source: hosted
174-
version: "0.6.1"
198+
version: "0.7.0"
175199
vector_math:
176200
dependency: transitive
177201
description:
@@ -180,14 +204,14 @@ packages:
180204
url: "https://pub.dev"
181205
source: hosted
182206
version: "2.1.4"
183-
web:
207+
vm_service:
184208
dependency: transitive
185209
description:
186-
name: web
187-
sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152
210+
name: vm_service
211+
sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec"
188212
url: "https://pub.dev"
189213
source: hosted
190-
version: "0.3.0"
214+
version: "14.2.1"
191215
sdks:
192-
dart: ">=3.2.0-194.0.dev <4.0.0"
193-
flutter: ">=1.20.0"
216+
dart: ">=3.3.0 <4.0.0"
217+
flutter: ">=3.18.0-18.0.pre.54"

0 commit comments

Comments
 (0)