From 62931f5c4ee5d9fe99d1b78d63f5c4d58eaaedc8 Mon Sep 17 00:00:00 2001 From: Rui Ying Date: Mon, 13 Dec 2021 20:40:03 -0800 Subject: [PATCH] v13.10.0 --- android/app/build.gradle | 4 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- ios/Podfile.lock | 5 ++- ios/learnX.xcodeproj/project.pbxproj | 8 ++-- package.json | 4 +- yarn.lock | 40 ++++++++++++------- 6 files changed, 37 insertions(+), 26 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 5c72cb41..70d8839a 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -141,8 +141,8 @@ android { applicationId 'io.robertying.learnx' minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 9202230 - versionName '13.9.0' + versionCode 9202240 + versionName '13.10.0' } splits { abi { diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index ffed3a25..84d1f85f 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 045a9a94..237d5ae2 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -353,7 +353,7 @@ PODS: - React-Core - RNLocalize (2.1.6): - React-Core - - RNReanimated (2.3.0): + - RNReanimated (2.2.4): - DoubleConversion - FBLazyVector - FBReactNativeSpec @@ -379,6 +379,7 @@ PODS: - React-RCTNetwork - React-RCTSettings - React-RCTText + - React-RCTVibration - ReactCommon/turbomodule/core - Yoga - RNScreens (3.10.1): @@ -637,7 +638,7 @@ SPEC CHECKSUMS: RNFS: 3ab21fa6c56d65566d1fb26c2228e2b6132e5e32 RNGestureHandler: e5c7cab5f214503dcefd6b2b0cefb050e1f51c4a RNLocalize: f10d91c76a5692d4cf6f218c70f6e4d7dcb42d1c - RNReanimated: 569c269480a76e39196aa17a5df08ef1561db5ff + RNReanimated: 65583befd5706cc9c86ae9a081786181ced37b93 RNScreens: 522705f2e5c9d27efb17f24aceb2bf8335bc7b8e RNShare: d76b8c9c6e6ffb38fc18f40b4338c9d867592ed3 RNVectorIcons: 3d5bff0d154b9bbe71e893a6605abaf1067846b1 diff --git a/ios/learnX.xcodeproj/project.pbxproj b/ios/learnX.xcodeproj/project.pbxproj index eecd03fc..ff1d19b2 100644 --- a/ios/learnX.xcodeproj/project.pbxproj +++ b/ios/learnX.xcodeproj/project.pbxproj @@ -317,7 +317,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; "CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 2231; + CURRENT_PROJECT_VERSION = 2240; DEVELOPMENT_TEAM = QX9PZ6H89F; ENABLE_BITCODE = NO; INFOPLIST_FILE = learnX/Info.plist; @@ -325,7 +325,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 13.9.0; + MARKETING_VERSION = 13.10.0; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", @@ -353,14 +353,14 @@ CODE_SIGN_IDENTITY = "Apple Development"; "CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 2231; + CURRENT_PROJECT_VERSION = 2240; DEVELOPMENT_TEAM = QX9PZ6H89F; INFOPLIST_FILE = learnX/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 13.9.0; + MARKETING_VERSION = 13.10.0; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", diff --git a/package.json b/package.json index 8eb78270..4dbf52c2 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "learnX", - "version": "13.9.0", + "version": "13.10.0", "private": true, "scripts": { "postinstall": "patch-package && chmod +x scripts/fix_react_native_interactable.sh && ./scripts/fix_react_native_interactable.sh", @@ -82,7 +82,7 @@ "react-native-localize": "2.1.6", "react-native-pager-view": "5.4.9", "react-native-paper": "4.11.1", - "react-native-reanimated": "2.3.0", + "react-native-reanimated": "2.2.4", "react-native-safe-area-context": "3.3.2", "react-native-screens": "3.10.1", "react-native-share": "7.3.2", diff --git a/yarn.lock b/yarn.lock index 7b8c9759..2e6fd743 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1813,11 +1813,6 @@ "@types/react" "*" hoist-non-react-statics "^3.3.0" -"@types/invariant@^2.2.35": - version "2.2.35" - resolved "https://registry.yarnpkg.com/@types/invariant/-/invariant-2.2.35.tgz#cd3ebf581a6557452735688d8daba6cf0bd5a3be" - integrity sha512-DxX1V9P8zdJPYQat1gHyY0xj3efl8gnMVjiM9iCY6y27lj+PoQWkgjt8jDqmovPqULkKVpKRg8J36iQiA+EtEg== - "@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0", "@types/istanbul-lib-coverage@^2.0.1": version "2.0.3" resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz#4ba8ddb720221f432e443bd5f9117fd22cfd4762" @@ -3265,7 +3260,7 @@ cosmiconfig@^6.0.0: path-type "^4.0.0" yaml "^1.7.2" -cross-fetch@^3.0.6, cross-fetch@^3.1.4: +cross-fetch@^3.0.4, cross-fetch@^3.0.6, cross-fetch@^3.1.4: version "3.1.4" resolved "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-3.1.4.tgz#9723f3a3a247bf8b89039f3a380a9244e8fa2f39" integrity sha512-1eAtFWdIubi6T4XPy6ei9iUFoKpUkIF971QLN8lIvvvwueI65+Nw5haMNKUwfJxabqlIIDODJKGrQ66gxC0PbQ== @@ -4289,6 +4284,11 @@ fbemitter@^2.1.1: dependencies: fbjs "^0.8.4" +fbjs-css-vars@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/fbjs-css-vars/-/fbjs-css-vars-1.0.2.tgz#216551136ae02fe255932c3ec8775f18e2c078b8" + integrity sha512-b2XGFAFdWZWg0phtAWLHCk836A1Xann+I+Dgd3Gk64MHKZO44FfoD1KxyvbSh0qZsIoXQGGlVztIY+oitJPpRQ== + fbjs@^0.8.4: version "0.8.18" resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.18.tgz#9835e0addb9aca2eff53295cd79ca1cfc7c9662a" @@ -4302,6 +4302,19 @@ fbjs@^0.8.4: setimmediate "^1.0.5" ua-parser-js "^0.7.30" +fbjs@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-3.0.1.tgz#70a053d34a96c2b513b559eaea124daed49ace64" + integrity sha512-8+vkGyT4lNDRKHQNPp0yh/6E7FfkLg89XqQbOYnvntRh+8RiSD43yrh9E5ejp1muCizTL4nDVG+y8W4e+LROHg== + dependencies: + cross-fetch "^3.0.4" + fbjs-css-vars "^1.0.0" + loose-envify "^1.0.0" + object-assign "^4.1.0" + promise "^7.1.1" + setimmediate "^1.0.5" + ua-parser-js "^0.7.30" + figures@^3.0.0: version "3.2.0" resolved "https://registry.yarnpkg.com/figures/-/figures-3.2.0.tgz#625c18bd293c604dc4a8ddb2febf0c88341746af" @@ -7852,17 +7865,14 @@ react-native-paper@4.11.1: color "^3.1.2" react-native-iphone-x-helper "^1.3.1" -react-native-reanimated@2.3.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/react-native-reanimated/-/react-native-reanimated-2.3.0.tgz#5d3bbcd140ab8ad47ac30d873635c7f1c3d06d4f" - integrity sha512-MSW2Uzj+Chd6qGS1gqNeF/U2l+xk44cD0PnNbU3v1paDI2/HAlzPhMtEy2WWtz83RZ4FtDuI/0o935SjJ7iSYg== +react-native-reanimated@2.2.4: + version "2.2.4" + resolved "https://registry.yarnpkg.com/react-native-reanimated/-/react-native-reanimated-2.2.4.tgz#36c5d15028b0bd7d479fba5199117ac870c7a532" + integrity sha512-Nn648MfEEnTCEiWsl1YmfkojiLyV0NMY0EiRdDRbZNfJVfxBuyqhCxI/4Jd7aBi162qpgf8XK2mByYgvF4zLrQ== dependencies: "@babel/plugin-transform-object-assign" "^7.10.4" - "@types/invariant" "^2.2.35" - invariant "^2.2.4" - lodash.isequal "^4.5.0" + fbjs "^3.0.0" mockdate "^3.0.2" - react-native-screens "^3.4.0" string-hash-64 "^1.0.3" react-native-safe-area-context@3.3.2: @@ -7870,7 +7880,7 @@ react-native-safe-area-context@3.3.2: resolved "https://registry.yarnpkg.com/react-native-safe-area-context/-/react-native-safe-area-context-3.3.2.tgz#9549a2ce580f2374edb05e49d661258d1b8bcaed" integrity sha512-yOwiiPJ1rk+/nfK13eafbpW6sKW0jOnsRem2C1LPJjM3tfTof6hlvV5eWHATye3XOpu2cJ7N+HdkUvUDGwFD2Q== -react-native-screens@3.10.1, react-native-screens@^3.4.0: +react-native-screens@3.10.1: version "3.10.1" resolved "https://registry.yarnpkg.com/react-native-screens/-/react-native-screens-3.10.1.tgz#2634a1a17380c559a06de391e4969ae72c4365ff" integrity sha512-ZF/XHnRsuinvDY1XiCWLXxoUoSf+NgsAes2SZfX9rFQQcv128zmh/+19SSavGrSf6rQNzqytEMdRGI6yr4Gbjw==