Release v1.11. With some fixes for android builds

daper · May 5, 2019 · 9c4087d · 9c4087d
1 parent a2914d2
commit 9c4087d
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -91,7 +91,7 @@ def enableSeparateBuildPerCPUArchitecture = false
 /**
  * Run Proguard to shrink the Java bytecode in release builds.
  */
-def enableProguardInReleaseBuilds = true
+def enableProguardInReleaseBuilds = false
 
 android {
     compileSdkVersion rootProject.ext.compileSdkVersion
@@ -101,8 +101,8 @@ android {
         applicationId "com.nextcloudpasswords"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 11
-        versionName "1.10"
+        versionCode 12
+        versionName "1.11"
         ndk {
             abiFilters "armeabi-v7a", "x86"
         }

diff --git a/android/app/src/main/res/xml/network_security_config.xml b/android/app/src/main/res/xml/network_security_config.xml
@@ -7,7 +7,7 @@
         </trust-anchors>
     </base-config>
     <domain-config cleartextTrafficPermitted="true">
-        <domain>127.0.0.1</domain>
-        <domain>localhost</domain>
+        <domain includeSubdomains="false">127.0.0.1</domain>
+        <domain includeSubdomains="false">localhost</domain>
     </domain-config>
 </network-security-config>
diff --git a/tools/fix-packages.sh b/tools/fix-packages.sh
@@ -1,10 +1,10 @@
 #!/bin/sh
 
 BASE_DIR=$(git rev-parse --show-toplevel)
-sed -i 's/ compile / implementation /g' $BASE_DIR/node_modules/react-native-sqlcipher-2/android/build.gradle
-sed -i 's/compileSdkVersion 23/compileSdkVersion 27/g' $BASE_DIR/node_modules/react-native-sqlcipher-2/android/build.gradle
-sed -i 's/ compile / implementation /g' $BASE_DIR/node_modules/react-native-fingerprint-scanner/android/build.gradle
-sed -i '/buildToolsVersion/d' $BASE_DIR/node_modules/react-native-fingerprint-scanner/android/build.gradle
-sed -i 's/compileSdkVersion 25/compileSdkVersion 27/g' $BASE_DIR/node_modules/react-native-fingerprint-scanner/android/build.gradle
-sed -i 's/targetSdkVersion 25/targetSdkVersion 27/g' $BASE_DIR/node_modules/react-native-fingerprint-scanner/android/build.gradle
-sed -i 's/1\.2\.71/1\.3\.0/g' $BASE_DIR/node_modules/react-native-webview/android/build.gradle
+sed -Ei 's/ compile / implementation /g' $BASE_DIR/node_modules/react-native-sqlcipher-2/android/build.gradle
+sed -Ei 's/compileSdkVersion [0-9]{2}/compileSdkVersion 28/g' $BASE_DIR/node_modules/react-native-sqlcipher-2/android/build.gradle
+sed -Ei 's/ compile / implementation /g' $BASE_DIR/node_modules/react-native-fingerprint-scanner/android/build.gradle
+sed -Ei '/buildToolsVersion/d' $BASE_DIR/node_modules/react-native-fingerprint-scanner/android/build.gradle
+sed -Ei 's/compileSdkVersion [0-9]{2}/compileSdkVersion 28/g' $BASE_DIR/node_modules/react-native-fingerprint-scanner/android/build.gradle
+sed -Ei 's/targetSdkVersion [0-9]{2}/targetSdkVersion 28/g' $BASE_DIR/node_modules/react-native-fingerprint-scanner/android/build.gradle
+sed -Ei 's/1\.2\.71/1\.3\.0/g' $BASE_DIR/node_modules/react-native-webview/android/build.gradle