Skip to content

Commit eaf8918

Browse files
authored
Merge pull request #131 from mixpanel/upgrade-android-target-api
upgrade android targetSdkVersion to 30
2 parents 6774427 + 64f74f3 commit eaf8918

File tree

11 files changed

+12
-27695
lines changed

11 files changed

+12
-27695
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
# node.js
55
node_modules/
66
npm-debug.log
7+
yarn.lock
78
yarn-error.log
89
package-lock.json
910
*.tgz

Samples/ContextAPIMixpanel/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ local.properties
3434
node_modules/
3535
npm-debug.log
3636
yarn-error.log
37+
yarn.lock
3738

3839
# BUCK
3940
buck-out/

Samples/ContextAPIMixpanel/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"lint": "eslint ."
1111
},
1212
"dependencies": {
13-
"mixpanel-react-native": "file:../../",
13+
"mixpanel-react-native": "file:../..",
1414
"react": "17.0.1",
1515
"react-native": "0.64.2"
1616
},

Samples/ContextAPIMixpanel/yarn.lock

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

Samples/MixpanelDemo/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ local.properties
3434
node_modules/
3535
npm-debug.log
3636
yarn-error.log
37+
yarn.lock
3738

3839
# BUCK
3940
buck-out/

Samples/MixpanelDemo/yarn.lock

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

Samples/SimpleMixpanel/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ local.properties
3434
node_modules/
3535
npm-debug.log
3636
yarn-error.log
37+
yarn.lock
3738

3839
# BUCK
3940
buck-out/

Samples/SimpleMixpanel/yarn.lock

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

android/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ buildscript {
1111
apply plugin: 'com.android.library'
1212

1313
android {
14-
compileSdkVersion 28
15-
buildToolsVersion "28.0.3"
14+
compileSdkVersion 30
15+
buildToolsVersion "30.0.3"
1616
defaultConfig {
1717
minSdkVersion 21
18-
targetSdkVersion 26
18+
targetSdkVersion 30
1919
versionCode 1
2020
versionName "1.0"
2121
}

release.py

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,12 @@
1111
def bump_version():
1212
replace_version('package.json', "\"version\": \"" + args.old + "\"", "\"version\": \"" + args.new + "\"")
1313
replace_version('__tests__/index.test.js', "\"$lib_version\": \"" + args.old + "\"", "\"$lib_version\": \"" + args.new + "\"")
14-
subprocess.call('cd Samples/MixpanelDemo;yarn upgrade mixpanel-react-native --latest', shell=True)
15-
subprocess.call('cd Samples/SimpleMixpanel;yarn upgrade mixpanel-react-native --latest', shell=True)
16-
subprocess.call('cd Samples/ContextAPIMixpanel;yarn upgrade mixpanel-react-native --latest', shell=True)
14+
subprocess.call('cd Samples/MixpanelDemo;rm -fr node_modules;rm -fr android/app/build', shell=True)
15+
subprocess.call('cd Samples/SimpleMixpanel;rm -fr node_modules;rm -fr android/app/build', shell=True)
16+
subprocess.call('cd Samples/ContextAPIMixpanel;rm -fr node_modules;rm -fr android/app/build', shell=True)
1717
subprocess.call('git add package.json', shell=True)
1818
subprocess.call('git add __tests__/index.test.js', shell=True)
19-
subprocess.call('git add Samples/MixpanelDemo/yarn.lock', shell=True)
20-
subprocess.call('git add Samples/SimpleMixpanel/yarn.lock', shell=True)
21-
subprocess.call('git add Samples/ContextAPIMixpanel/yarn.lock', shell=True)
19+
2220
subprocess.call('git commit -m "Version {}"'.format(args.new), shell=True)
2321
subprocess.call('git push', shell=True)
2422

0 commit comments

Comments
 (0)