Merge pull request #8 from anpigon/develop

Release
anpigon · Aug 11, 2021 · 420081d · 420081d
2 parents 93f7282 + 0b2f50e
commit 420081d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/.gitignore b/.gitignore
@@ -67,4 +67,5 @@ ios/*.mobileprovision
 ios/*.cer
 ios/*.dSYM.zip
 android/fastlane/README.md
-ios/fastlane/README.md
+ios/fastlane/README.md
+android/app/src/main/assets/index.android.bundle
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -140,8 +140,8 @@ android {
         applicationId "com.mobilekeychain.steem"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 35
-        versionName "1.3.12"
+        versionCode 36
+        versionName "1.3.13"
         multiDexEnabled true
         missingDimensionStrategy 'react-native-camera', 'general'
         resValue 'string', "CODE_PUSH_APK_BUILD_TIME", String.format("\"%d\"", System.currentTimeMillis())

diff --git a/package.json b/package.json
@@ -25,9 +25,7 @@
   },
   "scripts": {
     "android": "react-native run-android",
-    "android-bundle": "rm -f android/app/build/outputs/bundle/release/app-release.aab && cd android && ./gradlew bundleRelease && cd ..",
-    "android-bundle:debug": "rm -f android/app/build/outputs/bundle/debug/app-debug.aab && cd android && ./gradlew bundleDebug && cd ..",
-    "android-assemble": "rm -f android/app/build/outputs/apk/release/app-release.apk && cd android && ./gradlew assembleRelease && cd ..",
+    "android-assemble": "rm -f android/app/build/outputs/apk/release/app-release.apk && cd android && ./gradlew assembleRelease --stacktrace && cd ..",
     "android-release": "react-native run-android --variant=release",
     "android-release:stage": "react-native run-android --variant=releaseStaging",
     "android-clean": "cd android && ./gradlew clean && cd ..",
@@ -41,7 +39,7 @@
     "debug": "open 'rndebugger://set-debugger-loc?host=localhost&port=8081’",
     "postinstall": "patch-package && rndebugger-open",
     "prebuild-android": "npx jetify && react-native bundle --platform android --dev false --entry-file index.js --bundle-output android/app/src/main/assets/index.android.bundle",
-    "appDistribution:android": "cd android && ./gradlew assembleRelease appDistributionUploadRelease",
+    "build-android": "rm -f android/app/build/outputs/bundle/release/app-release.aab && cd android && ./gradlew bundleRelease --stacktrace && cd ..",
     "beta:android": "npm run prebuild-android && cd ./android && bundle exec fastlane beta version:patch",
     "beta:ios": "cd ./ios && bundle exec fastlane beta version:patch",
     "beta": "npm run beta:android && npm run beta:ios",