From f9102ad835056ac2bae88358eff208d27086883a Mon Sep 17 00:00:00 2001 From: Rui Ying Date: Sat, 14 Dec 2019 01:16:55 +0800 Subject: [PATCH] v6.4.0 --- android/app/build.gradle | 2 +- android/gradle.properties | 2 +- ios/learnX.xcodeproj/project.pbxproj | 8 ++-- package.json | 6 +-- yarn.lock | 72 +++++++++++----------------- 5 files changed, 37 insertions(+), 53 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index fa674642..3a5dbe6d 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -149,7 +149,7 @@ android { minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion versionCode Integer.parseInt(VERSION_CODE) - versionName "6.3.0" + versionName "6.4.0" missingDimensionStrategy "RNN.reactNativeVersion", "reactNative60" } diff --git a/android/gradle.properties b/android/gradle.properties index d357baf6..f8415388 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -5,4 +5,4 @@ org.gradle.jvmargs=-Xmx2g -XX\:MaxMetaspaceSize\=512m -XX\:+HeapDumpOnOutOfMemor android.useAndroidX=true android.enableJetifier=true -VERSION_CODE=6000010 +VERSION_CODE=6000030 diff --git a/ios/learnX.xcodeproj/project.pbxproj b/ios/learnX.xcodeproj/project.pbxproj index 788eb4bb..7a8d2f09 100644 --- a/ios/learnX.xcodeproj/project.pbxproj +++ b/ios/learnX.xcodeproj/project.pbxproj @@ -314,7 +314,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 310; + CURRENT_PROJECT_VERSION = 330; DEAD_CODE_STRIPPING = NO; DEVELOPMENT_TEAM = QX9PZ6H89F; INFOPLIST_FILE = learnX/Info.plist; @@ -322,7 +322,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 6.3.0; + MARKETING_VERSION = 6.4.0; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", @@ -343,14 +343,14 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 310; + CURRENT_PROJECT_VERSION = 330; DEVELOPMENT_TEAM = QX9PZ6H89F; INFOPLIST_FILE = learnX/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 6.3.0; + MARKETING_VERSION = 6.4.0; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", diff --git a/package.json b/package.json index 734eb1e0..e592ffb2 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "learnX", "private": true, "license": "MIT", - "version": "6.3.0", + "version": "6.4.0", "scripts": { "android": "react-native run-android --no-jetifier", "android:beta": "fastlane android beta", @@ -37,7 +37,7 @@ "react-native-interactable": "2.0.1", "react-native-localize": "1.3.1", "react-native-modal": "11.5.3", - "react-native-navigation": "4.0.4", + "react-native-navigation": "4.0.5", "react-native-paper": "3.3.0", "react-native-push-notification": "3.1.9", "react-native-reanimated": "1.4.0", @@ -76,7 +76,7 @@ "babel-jest": "24.9.0", "babel-plugin-preval": "4.0.0", "babel-plugin-transform-remove-console": "6.9.4", - "detox": "14.9.0", + "detox": "14.9.1", "eslint": "6.7.2", "eslint-plugin-prettier": "3.1.1", "husky": "3.1.0", diff --git a/yarn.lock b/yarn.lock index fe5a0f68..b1293166 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2622,10 +2622,10 @@ detect-newline@^2.1.0: resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-2.1.0.tgz#f41f1c10be4b00e87b5f13da680759f2c5bfd3e2" integrity sha1-9B8cEL5LAOh7XxPaaAdZ8sW/0+I= -detox@14.9.0: - version "14.9.0" - resolved "https://registry.yarnpkg.com/detox/-/detox-14.9.0.tgz#18f49e41997fe6e169467d0dc13ee90c9a376fcc" - integrity sha512-iW8F2IoyVUpm2KOfv7Chl9CWmJvQHd0RUAgqh1thJ8yQisi7ll8CjuCtX9KH+ylFcwvJlb7DIZ9Tw323R+u5Cg== +detox@14.9.1: + version "14.9.1" + resolved "https://registry.yarnpkg.com/detox/-/detox-14.9.1.tgz#e86eb3c3349c8a5951ba0e06208dac97496d2b59" + integrity sha512-/xbxVZYRsVlCeN+e0UP3ybjOPZ231KXDvjlJ911H/ALoipLYXIomEIVk7WgArWNxCa5KUy0EvdpVCF7q7o64eQ== dependencies: "@babel/core" "^7.4.5" bunyan "^1.8.12" @@ -2832,23 +2832,7 @@ errorhandler@^1.5.0: accepts "~1.3.7" escape-html "~1.0.3" -es-abstract@^1.12.0, es-abstract@^1.15.0, es-abstract@^1.5.1: - version "1.16.3" - resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.16.3.tgz#52490d978f96ff9f89ec15b5cf244304a5bca161" - integrity sha512-WtY7Fx5LiOnSYgF5eg/1T+GONaGmpvpPdCpSnYij+U2gDTL0UPfWrhDw7b2IYb+9NQJsYpCA0wOQvZfsd6YwRw== - dependencies: - es-to-primitive "^1.2.1" - function-bind "^1.1.1" - has "^1.0.3" - has-symbols "^1.0.1" - is-callable "^1.1.4" - is-regex "^1.0.4" - object-inspect "^1.7.0" - object-keys "^1.1.1" - string.prototype.trimleft "^2.1.0" - string.prototype.trimright "^2.1.0" - -es-abstract@^1.17.0-next.0: +es-abstract@^1.17.0-next.0, es-abstract@^1.17.0-next.1: version "1.17.0-next.1" resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.0-next.1.tgz#94acc93e20b05a6e96dacb5ab2f1cb3a81fc2172" integrity sha512-7MmGr03N7Rnuid6+wyhD9sHNE2n4tFSwExnU2lQl3lIo2ShXWGePY80zYaoMOmILWv57H0amMjZGHNzzGG70Rw== @@ -3613,9 +3597,9 @@ fs.realpath@^1.0.0: integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8= fsevents@^1.2.7: - version "1.2.9" - resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.9.tgz#3f5ed66583ccd6f400b5a00db6f7e861363e388f" - integrity sha512-oeyj2H3EjjonWcFjD5NvZNE9Rqe4UW+nQBU2HNeKw0koVLEFIhtyETyAakeAM3de7Z/SW5kcA+fZUait9EApnw== + version "1.2.10" + resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.10.tgz#47252793be8a625a5f96dfaa1c88547f4b20595a" + integrity sha512-Dw5DScF/8AWhWzWRbnQrFJfeR/TOJZjRr9Du9kfmd8t234ICcVeDBlauFl/jVcE5ZewhlPoCFvIqp0SE3kAVxA== dependencies: nan "^2.12.1" node-pre-gyp "^0.12.0" @@ -6081,32 +6065,32 @@ object.assign@^4.1.0: object-keys "^1.0.11" object.entries@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.0.tgz#2024fc6d6ba246aee38bdb0ffd5cfbcf371b7519" - integrity sha512-l+H6EQ8qzGRxbkHOd5I/aHRhHDKoQXQ8g0BYt4uSweQU1/J6dZUOyWh9a2Vky35YCKjzmgxOzta2hH6kf9HuXA== + version "1.1.1" + resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.1.tgz#ee1cf04153de02bb093fec33683900f57ce5399b" + integrity sha512-ilqR7BgdyZetJutmDPfXCDffGa0/Yzl2ivVNpbx/g4UeWrCdRnFDUBrKJGLhGieRHDATnyZXWBeCb29k9CJysQ== dependencies: define-properties "^1.1.3" - es-abstract "^1.12.0" + es-abstract "^1.17.0-next.1" function-bind "^1.1.1" has "^1.0.3" object.fromentries@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.1.tgz#050f077855c7af8ae6649f45c80b16ee2d31e704" - integrity sha512-PUQv8Hbg3j2QX0IQYv3iAGCbGcu4yY4KQ92/dhA4sFSixBmSmp13UpDLs6jGK8rBtbmhNNIK99LD2k293jpiGA== + version "2.0.2" + resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.2.tgz#4a09c9b9bb3843dd0f89acdb517a794d4f355ac9" + integrity sha512-r3ZiBH7MQppDJVLx6fhD618GKNG40CZYH9wgwdhKxBDDbQgjeWGGd4AtkZad84d291YxvWe7bJGuE65Anh0dxQ== dependencies: define-properties "^1.1.3" - es-abstract "^1.15.0" + es-abstract "^1.17.0-next.1" function-bind "^1.1.1" has "^1.0.3" object.getownpropertydescriptors@^2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz#8758c846f5b407adab0f236e0986f14b051caa16" - integrity sha1-h1jIRvW0B62rDyNuCYbxSwUcqhY= + version "2.1.0" + resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz#369bf1f9592d8ab89d712dced5cb81c7c5352649" + integrity sha512-Z53Oah9A3TdLoblT7VKJaTDdXdT+lQO+cNpKVnya5JDe9uLvzu1YyY1yFDFrcxrlRgWrEFH0jJtD/IbuwjcEVg== dependencies: - define-properties "^1.1.2" - es-abstract "^1.5.1" + define-properties "^1.1.3" + es-abstract "^1.17.0-next.1" object.pick@^1.3.0: version "1.3.0" @@ -6814,10 +6798,10 @@ react-native-modal@11.5.3: prop-types "^15.6.2" react-native-animatable "1.3.3" -react-native-navigation@4.0.4: - version "4.0.4" - resolved "https://registry.yarnpkg.com/react-native-navigation/-/react-native-navigation-4.0.4.tgz#d5c623c4330c8831335baad36e3bd0bbf0e4aded" - integrity sha512-xTmGUYa4BM5y1RuwkJ51NVkp55Z5ueZNPu3G9Ipy1w45C8wKKNoZQsRlznPFErtLteUgjAeEiHxQXkxiUv5X6A== +react-native-navigation@4.0.5: + version "4.0.5" + resolved "https://registry.yarnpkg.com/react-native-navigation/-/react-native-navigation-4.0.5.tgz#7cf6f5c5b33aa79cc518d4c2135372c50c69d4b1" + integrity sha512-BJmdSyjqU8J1M8t8EKIfaTJjvwgsoEfZ6pgxErXaIkLz8ggyHtmH1wpuQBwSK8Ya0OjpLH0WFcy42v13JgjMVw== dependencies: hoist-non-react-statics "3.x.x" lodash "4.17.x" @@ -7139,9 +7123,9 @@ regjsgen@^0.5.0: integrity sha512-5qxzGZjDs9w4tzT3TPhCJqWdCc3RLYwy9J2NB0nm5Lz+S273lvWcpjaTGHsT1dc6Hhfq41uSEOw8wBmxrKOuyg== regjsparser@^0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.0.tgz#f1e6ae8b7da2bae96c99399b868cd6c933a2ba9c" - integrity sha512-RQ7YyokLiQBomUJuUG8iGVvkgOLxwyZM8k6d3q5SAXpg4r5TZJZigKFvC6PpD+qQ98bCDC5YelPeA3EucDoNeQ== + version "0.6.1" + resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.1.tgz#5b6b28c418f312ef42898dc6865ae2d4b9f0f7a2" + integrity sha512-7LutE94sz/NKSYegK+/4E77+8DipxF+Qn2Tmu362AcmsF2NYq/wx3+ObvU90TKEhjf7hQoFXo23ajjrXP7eUgg== dependencies: jsesc "~0.5.0"