diff --git a/android/app/build.gradle b/android/app/build.gradle index 834ca64..51d4678 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -82,19 +82,6 @@ def enableSeparateBuildPerCPUArchitecture = false */ def enableProguardInReleaseBuilds = false -def getPassword(String currentUser, String keyChain) { - def stdout = new ByteArrayOutputStream() - def stderr = new ByteArrayOutputStream() - exec { - commandLine 'security', '-q', 'find-generic-password', '-a', currentUser, '-s', keyChain, '-w' - standardOutput = stdout - errorOutput = stderr - ignoreExitValue true - } - //noinspection GroovyAssignabilityCheck - stdout.toString().trim() -} -def pass = getPassword("maiyatang","maiyatang.jks") def releaseTime() { return new Date().format("yyyy-MM-dd", TimeZone.getTimeZone("UTC")) } @@ -113,14 +100,6 @@ android { abiFilters "armeabi-v7a", "x86" } } - signingConfigs { - release { - storeFile file(MYAPP_RELEASE_STORE_FILE) - storePassword pass - keyAlias MYAPP_RELEASE_KEY_ALIAS - keyPassword pass - } - } splits { abi { reset() @@ -133,7 +112,6 @@ android { release { minifyEnabled enableProguardInReleaseBuilds proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro" - signingConfig signingConfigs.release } } // applicationVariants are e.g. debug, release diff --git a/app/app.js b/app/app.js index 12bee79..e941421 100644 --- a/app/app.js +++ b/app/app.js @@ -8,11 +8,10 @@ import React, { Component } from 'react' import { View, BackAndroid, - Navigator, AsyncStorage, StatusBar } from 'react-native' - +import {Navigator} from 'react-native-deprecated-custom-components'; import Storage from 'react-native-storage' import Realm from 'realm' diff --git a/package.json b/package.json index f31365d..003c1cf 100644 --- a/package.json +++ b/package.json @@ -10,8 +10,9 @@ "lodash": "^4.17.4", "mockjs": "^1.0.1-beta3", "query-string": "^4.3.2", - "react": "15.4.2", - "react-native": "0.42.3", + "react": "16.0.0-alpha.12", + "react-native": "0.46.0", + "react-native-deprecated-custom-components": "^0.1.1", "react-native-root-toast": "^1.0.5", "react-native-scrollable-tab-view": "^0.7.2", "react-native-storage": "^0.1.5",