Skip to content

Commit 54a2f11

Browse files
authored
Merge pull request #141 from mixpanel/zihe-bump-native
bump iOS to 4.2.5 and Android to 7.5.0
2 parents 751b093 + 324c7d2 commit 54a2f11

File tree

5 files changed

+45
-73
lines changed

5 files changed

+45
-73
lines changed

.github/workflows/flutter.yml

Lines changed: 41 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -2,55 +2,58 @@ name: Mixpanel Flutter SDK CI
22

33
on:
44
push:
5-
branches: [ main ]
5+
branches: [main]
66
pull_request:
7-
branches: [ main ]
7+
branches: [main]
88

99
jobs:
1010
test-main-code:
1111
runs-on: macos-latest
1212
steps:
13-
- uses: actions/checkout@v2
14-
- uses: actions/setup-java@v1
15-
with:
16-
java-version: '12.x'
17-
- uses: subosito/flutter-action@v1
18-
with:
19-
flutter-version: '3.16.0'
20-
- run: flutter pub get
21-
- run: flutter test
22-
- run: flutter analyze --no-pub --no-current-package lib
13+
- uses: actions/checkout@v2
14+
- uses: actions/setup-java@v1
15+
with:
16+
java-version: "12.x"
17+
- uses: subosito/flutter-action@v1
18+
with:
19+
flutter-version: "3.16.0"
20+
- run: flutter pub get
21+
- run: flutter test
22+
- run: flutter analyze --no-pub --no-current-package lib
2323

2424
test-android-integration:
2525
runs-on: macos-11
2626
steps:
27-
- uses: actions/checkout@v2
28-
- uses: actions/setup-java@v1
29-
with:
30-
java-version: '12.x'
31-
- uses: subosito/flutter-action@v1
32-
with:
33-
flutter-version: '3.16.0'
34-
- name: Test Android integration
35-
working-directory: example
36-
run: flutter build apk
27+
- uses: actions/checkout@v2
28+
- uses: actions/setup-java@v1
29+
with:
30+
java-version: "12.x"
31+
- uses: subosito/flutter-action@v1
32+
with:
33+
flutter-version: "3.16.0"
34+
- name: Test Android integration
35+
working-directory: example
36+
run: flutter build apk
3737

3838
test-ios-integration:
3939
runs-on: macos-latest
4040
steps:
41-
- uses: actions/checkout@v2
42-
- uses: actions/setup-java@v1
43-
with:
44-
java-version: '12.x'
45-
- uses: subosito/flutter-action@v1
46-
with:
47-
flutter-version: '3.16.0'
48-
- name: Clean
49-
working-directory: example
50-
run: flutter clean
51-
- name: Prep
52-
working-directory: example
53-
run: flutter pub get
54-
- name: Test iOS integration
55-
working-directory: example
56-
run: flutter build ios --debug --simulator --no-codesign
41+
- uses: actions/checkout@v2
42+
- uses: actions/setup-java@v1
43+
with:
44+
java-version: "12.x"
45+
- uses: subosito/flutter-action@v1
46+
with:
47+
flutter-version: "3.16.0"
48+
- name: Clean
49+
working-directory: example
50+
run: flutter clean
51+
- name: Flutter pub get
52+
working-directory: example
53+
run: flutter pub get
54+
- name: CocoaPods update
55+
working-directory: example/ios
56+
run: pod repo update
57+
- name: Test iOS integration
58+
working-directory: example
59+
run: flutter build ios --debug --simulator --no-codesign

android/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ apply plugin: 'com.android.library'
2424

2525
android {
2626
if (project.android.hasProperty("namespace")) {
27-
namespace("com.mixpanel.mixpanel_flutter")
27+
namespace("com.mixpanel.mixpanel_flutter")
2828
}
2929
compileSdkVersion 30
3030
buildToolsVersion '30.0.3'
@@ -38,5 +38,5 @@ android {
3838
}
3939

4040
dependencies {
41-
implementation "com.mixpanel.android:mixpanel-android:7.3.2"
41+
implementation "com.mixpanel.android:mixpanel-android:7.5.0"
4242
}

example/ios/Podfile.lock

Lines changed: 0 additions & 31 deletions
This file was deleted.

example/pubspec.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ packages:
110110
path: ".."
111111
relative: true
112112
source: path
113-
version: "2.2.0"
113+
version: "2.3.0"
114114
path:
115115
dependency: transitive
116116
description:

ios/mixpanel_flutter.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Pod::Spec.new do |s|
1212
s.source = { :path => '.' }
1313
s.source_files = 'Classes/**/*'
1414
s.dependency 'Flutter'
15-
s.dependency 'Mixpanel-swift', '4.2.0'
15+
s.dependency 'Mixpanel-swift', '4.2.5'
1616
s.platform = :ios, '11.0'
1717

1818
# Flutter.framework does not contain a i386 slice.

0 commit comments

Comments
 (0)