Merge tag '1.3.5' into develop

no message
Plant-for-the-Planet-org · Aug 13, 2020 · 08a6260 · 08a6260
2 parents 60bdc8a + a8af4d4
commit 08a6260
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 4 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -149,7 +149,7 @@ android {
         applicationId "org.pftp"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 31
+        versionCode 34
         versionName "1.3.5"
         ndk {
             abiFilters "armeabi-v7a", "x86", "arm64-v8a", "x86_64"

diff --git a/app/components/AboutUs/LicenseInfo.json b/app/components/AboutUs/LicenseInfo.json
@@ -489,6 +489,13 @@
       "path": "/Users/norbertschuler/Development/PFTP/treecounter-app/node_modules/react-native-slick",
       "licenseFile": "node_modules/react-native-slick/LICENSE"
     },
+    "[email protected]": {
+      "licenses": "MIT",
+      "repository": "https://github.com/crazycodeboy/react-native-splash-screen",
+      "publisher": "crazycodeboy",
+      "path": "/Users/norbertschuler/Development/PFTP/treecounter-app/node_modules/react-native-splash-screen",
+      "licenseFile": "node_modules/react-native-splash-screen/LICENSE"
+    },
     "[email protected]": {
       "licenses": "ISC",
       "repository": "https://github.com/matiascba/react-native-svg-uri",

diff --git a/ios/Podfile.lock b/ios/Podfile.lock
@@ -647,4 +647,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: ea0fdd044658ebb0f2a28446d61b2692711df3b3
 
-COCOAPODS: 1.8.4
+COCOAPODS: 1.9.3
diff --git a/ios/TreecounterApp.xcodeproj/project.pbxproj b/ios/TreecounterApp.xcodeproj/project.pbxproj
@@ -635,7 +635,7 @@
 				CODE_SIGN_ENTITLEMENTS = TreecounterApp/TreecounterApp.entitlements;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 23;
+				CURRENT_PROJECT_VERSION = 26;
 				DEAD_CODE_STRIPPING = NO;
 				DEVELOPMENT_TEAM = UYRJ8SA699;
 				HEADER_SEARCH_PATHS = (
@@ -678,7 +678,7 @@
 				CODE_SIGN_ENTITLEMENTS = TreecounterApp/TreecounterApp.entitlements;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 23;
+				CURRENT_PROJECT_VERSION = 26;
 				DEAD_CODE_STRIPPING = NO;
 				DEVELOPMENT_TEAM = UYRJ8SA699;
 				HEADER_SEARCH_PATHS = (

diff --git a/release/upload-native-source-maps.sh b/release/upload-native-source-maps.sh
@@ -45,4 +45,20 @@ curl --http1.1 https://upload.bugsnag.com/react-native-source-map \
    -F [email protected] \
    -F projectRoot=`pwd`
 
+# also upload iOS source maps for package version
+curl --http1.1 https://upload.bugsnag.com/react-native-source-map \
+   -F apiKey="$BUGSNAG_API_KEY" \
+   -F appVersion="$PACKAGE_VERSION" \
+   -F dev=false \
+   -F platform=ios \
+   -F [email protected] \
+   -F [email protected] \
+   -F projectRoot=`pwd`
+
+# upload the dSYMs you can download from AppStore Connect
+# curl --http1.1 https://upload.bugsnag.com/ \
+#  -F apiKey="$BUGSNAG_API_KEY" \
+#  -F dsym=@~/Downloads/appDsyms.zip \
+#  -F projectRoot=`pwd`
+
 rm ios-release.bundle ios-release.bundle.map