From 827bc033b9addba85e1f17fae1d01d17b931d80e Mon Sep 17 00:00:00 2001 From: guoshuyu Date: Thu, 17 Jan 2019 10:41:59 +0800 Subject: [PATCH] update to 0.57.8 update lib release 2.1 --- README.md | 2 +- README_EN.md | 2 +- android/app/build.gradle | 4 +-- android/settings.gradle | 8 +++--- app/components/AboutPage.js | 2 +- app/components/common/CommonTextInputModal.js | 2 +- app/components/common/LoadingModal.js | 2 +- ios/GSYGithubAPP.xcodeproj/project.pbxproj | 26 +++++++++---------- package.json | 3 ++- 9 files changed, 26 insertions(+), 25 deletions(-) diff --git a/README.md b/README.md index 704139f..1f0c537 100644 --- a/README.md +++ b/README.md @@ -89,7 +89,7 @@ ### 第三方框架 -* [react-native(0.57.5)](http://reactnative.cn/docs/0.51/getting-started.html) +* [react-native(0.57.8)](http://reactnative.cn/docs/0.51/getting-started.html) * [react-native-router-flux 路由框架](https://github.com/aksonov/react-native-router-flux) * [react-native-vector-icons 矢量字体库图标 ](https://github.com/oblador/react-native-vector-icons) * [react-redux redux](https://github.com/reactjs/react-redux) diff --git a/README_EN.md b/README_EN.md index b33b79f..b6ad67e 100644 --- a/README_EN.md +++ b/README_EN.md @@ -82,7 +82,7 @@ With the use and feedback of the project, will user experience and function opti ### Third-party framework -* [react-native(0.57.5)](http://reactnative.cn/docs/0.51/getting-started.html) +* [react-native(0.57.8)](http://reactnative.cn/docs/0.51/getting-started.html) * [react-native-router-flux](https://github.com/aksonov/react-native-router-flux) * [react-native-vector-icons ](https://github.com/oblador/react-native-vector-icons) * [react-redux redux](https://github.com/reactjs/react-redux) diff --git a/android/app/build.gradle b/android/app/build.gradle index 58445f8..9a8fdd6 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -165,9 +165,9 @@ android { dependencies { compile fileTree(dir: "libs", include: ["*.jar"]) - implementation project(':react-native-version-number') + implementation project(':react-native-version-number-fix-new') implementation project(':react-native-vector-icons') - implementation project(':react-native-spinkit') + implementation project(':react-native-spinkit-fix-new') implementation project(':react-native-i18n') implementation project(':react-native-image-crop-picker') implementation project(':realm') diff --git a/android/settings.gradle b/android/settings.gradle index eb971bc..16f4a64 100644 --- a/android/settings.gradle +++ b/android/settings.gradle @@ -5,14 +5,14 @@ include ':react-native-image-crop-picker' project(':react-native-image-crop-picker').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-image-crop-picker/android') include ':react-native-image-crop-picker' project(':react-native-image-crop-picker').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-image-crop-picker/android') -include ':react-native-version-number' -project(':react-native-version-number').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-version-number/android') +include ':react-native-version-number-fix-new' +project(':react-native-version-number-fix-new').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-version-number-fix-new/android') include ':realm' project(':realm').projectDir = new File(rootProject.projectDir, '../node_modules/realm/android') include ':react-native-vector-icons' project(':react-native-vector-icons').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-vector-icons/android') -include ':react-native-spinkit' -project(':react-native-spinkit').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-spinkit/android') +include ':react-native-spinkit-fix-new' +project(':react-native-spinkit-fix-new').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-spinkit-fix-new/android') include ':react-native-i18n' project(':react-native-i18n').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-i18n/android') diff --git a/app/components/AboutPage.js b/app/components/AboutPage.js index 0f90ca3..ecbeba3 100644 --- a/app/components/AboutPage.js +++ b/app/components/AboutPage.js @@ -11,7 +11,7 @@ import styles from "../style" import I18n from '../style/i18n' import CommonRowItem from "./common/CommonRowItem"; import * as Constant from "../style/constant"; -import VersionNumber from 'react-native-version-number'; +import VersionNumber from 'react-native-version-number-fix-new'; import issueActions from "../store/actions/issue"; import repositoryActions from "../store/actions/repository"; import Toast from './common/ToastProxy' diff --git a/app/components/common/CommonTextInputModal.js b/app/components/common/CommonTextInputModal.js index f7092b7..d0cca2e 100644 --- a/app/components/common/CommonTextInputModal.js +++ b/app/components/common/CommonTextInputModal.js @@ -17,7 +17,7 @@ import * as Constant from "../../style/constant" import I18n from '../../style/i18n' import {uploadQiNiu} from '../../net/qiniu' import Modal from 'react-native-modalbox'; -import Spinner from 'react-native-spinkit'; +import Spinner from 'react-native-spinkit-fix-new'; import {Actions} from "react-native-router-flux"; import CommonInputBar from "./CommonInputBar"; import ImagePicker from 'react-native-image-crop-picker'; diff --git a/app/components/common/LoadingModal.js b/app/components/common/LoadingModal.js index 133ec3a..ac2e9f6 100644 --- a/app/components/common/LoadingModal.js +++ b/app/components/common/LoadingModal.js @@ -12,7 +12,7 @@ import styles, {screenWidth, screenHeight} from "../../style/index" import * as Constant from "../../style/constant" import I18n from '../../style/i18n' import Modal from 'react-native-modalbox'; -import Spinner from 'react-native-spinkit'; +import Spinner from 'react-native-spinkit-fix-new'; import {Actions} from "react-native-router-flux"; diff --git a/ios/GSYGithubAPP.xcodeproj/project.pbxproj b/ios/GSYGithubAPP.xcodeproj/project.pbxproj index 5dea6d7..8a364fa 100644 --- a/ios/GSYGithubAPP.xcodeproj/project.pbxproj +++ b/ios/GSYGithubAPP.xcodeproj/project.pbxproj @@ -506,7 +506,7 @@ 959969AB7168463BAC658DBE /* SimpleLineIcons.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = SimpleLineIcons.ttf; path = "../node_modules/react-native-vector-icons/Fonts/SimpleLineIcons.ttf"; sourceTree = ""; }; ADBDB91F1DFEBF0600ED6528 /* RCTBlob.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTBlob.xcodeproj; path = "../node_modules/react-native/Libraries/Blob/RCTBlob.xcodeproj"; sourceTree = ""; }; B079EF181C024C34AFBAA808 /* RNI18n.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = RNI18n.xcodeproj; path = "../node_modules/react-native-i18n/ios/RNI18n.xcodeproj"; sourceTree = ""; }; - B37C8B2195594CBEAF28AC2A /* RNVersionNumber.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = RNVersionNumber.xcodeproj; path = "../node_modules/react-native-version-number/ios/RNVersionNumber.xcodeproj"; sourceTree = ""; }; + B37C8B2195594CBEAF28AC2A /* RNVersionNumber.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = RNVersionNumber.xcodeproj; path = "../node_modules/react-native-version-number-fix-new/ios/RNVersionNumber.xcodeproj"; sourceTree = ""; }; B818BF94477740D387E05A2F /* libLottieReactNative.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libLottieReactNative.a; sourceTree = ""; }; C7116925C2E84F20AF75974B /* RNSpinkit.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = RNSpinkit.xcodeproj; path = "../node_modules/react-native-spinkit/ios/RNSpinkit.xcodeproj"; sourceTree = ""; }; CA1BBF2E2A514CEC83B04305 /* MaterialIcons.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = MaterialIcons.ttf; path = "../node_modules/react-native-vector-icons/Fonts/MaterialIcons.ttf"; sourceTree = ""; }; @@ -1615,10 +1615,10 @@ HEADER_SEARCH_PATHS = ( "$(inherited)", "$(SRCROOT)/../node_modules/react-native-i18n/ios", - "$(SRCROOT)/../node_modules/react-native-spinkit/ios/**", + "$(SRCROOT)/../node_modules/react-native-spinkit-fix-new/ios/**", "$(SRCROOT)/../node_modules/react-native-vector-icons/RNVectorIconsManager", "$(SRCROOT)..\node_modules\nealmsrc/**", - "$(SRCROOT)/../node_modules/react-native-version-number/ios", + "$(SRCROOT)/../node_modules/react-native-version-number-fix-new/ios", "$(SRCROOT)..\node_modules\neact-native-image-crop-pickerios/**", "$(SRCROOT)..\node_moduleslottie-react-nativesrciosLottieReactNative", "$(SRCROOT)..\node_moduleslottie-ioslottie-iosClasses/**", @@ -1655,10 +1655,10 @@ HEADER_SEARCH_PATHS = ( "$(inherited)", "$(SRCROOT)/../node_modules/react-native-i18n/ios", - "$(SRCROOT)/../node_modules/react-native-spinkit/ios/**", + "$(SRCROOT)/../node_modules/react-native-spinkit-fix-new/ios/**", "$(SRCROOT)/../node_modules/react-native-vector-icons/RNVectorIconsManager", "$(SRCROOT)..\node_modules\nealmsrc/**", - "$(SRCROOT)/../node_modules/react-native-version-number/ios", + "$(SRCROOT)/../node_modules/react-native-version-number-fix-new/ios", "$(SRCROOT)..\node_modules\neact-native-image-crop-pickerios/**", "$(SRCROOT)..\node_moduleslottie-react-nativesrciosLottieReactNative", "$(SRCROOT)..\node_moduleslottie-ioslottie-iosClasses/**", @@ -1699,10 +1699,10 @@ HEADER_SEARCH_PATHS = ( "$(inherited)", "$(SRCROOT)/../node_modules/react-native-i18n/ios", - "$(SRCROOT)/../node_modules/react-native-spinkit/ios/**", + "$(SRCROOT)/../node_modules/react-native-spinkit-fix-new/ios/**", "$(SRCROOT)/../node_modules/react-native-vector-icons/RNVectorIconsManager", "$(SRCROOT)..\node_modules\nealmsrc/**", - "$(SRCROOT)/../node_modules/react-native-version-number/ios", + "$(SRCROOT)/../node_modules/react-native-version-number-fix-new/ios", "$(SRCROOT)..\node_modules\neact-native-image-crop-pickerios/**", "$(SRCROOT)..\node_moduleslottie-react-nativesrciosLottieReactNative", "$(SRCROOT)..\node_moduleslottie-ioslottie-iosClasses/**", @@ -1733,10 +1733,10 @@ HEADER_SEARCH_PATHS = ( "$(inherited)", "$(SRCROOT)/../node_modules/react-native-i18n/ios", - "$(SRCROOT)/../node_modules/react-native-spinkit/ios/**", + "$(SRCROOT)/../node_modules/react-native-spinkit-fix-new/ios/**", "$(SRCROOT)/../node_modules/react-native-vector-icons/RNVectorIconsManager", "$(SRCROOT)..\node_modules\nealmsrc/**", - "$(SRCROOT)/../node_modules/react-native-version-number/ios", + "$(SRCROOT)/../node_modules/react-native-version-number-fix-new/ios", "$(SRCROOT)..\node_modules\neact-native-image-crop-pickerios/**", "$(SRCROOT)..\node_moduleslottie-react-nativesrciosLottieReactNative", "$(SRCROOT)..\node_moduleslottie-ioslottie-iosClasses/**", @@ -1770,10 +1770,10 @@ HEADER_SEARCH_PATHS = ( "$(inherited)", "$(SRCROOT)/../node_modules/react-native-i18n/ios", - "$(SRCROOT)/../node_modules/react-native-spinkit/ios/**", + "$(SRCROOT)/../node_modules/react-native-spinkit-fix-new/ios/**", "$(SRCROOT)/../node_modules/react-native-vector-icons/RNVectorIconsManager", "$(SRCROOT)..\node_modules\nealmsrc/**", - "$(SRCROOT)/../node_modules/react-native-version-number/ios", + "$(SRCROOT)/../node_modules/react-native-version-number-fix-new/ios", "$(SRCROOT)..\node_modules\neact-native-image-crop-pickerios/**", "$(SRCROOT)..\node_moduleslottie-react-nativesrciosLottieReactNative", "$(SRCROOT)..\node_moduleslottie-ioslottie-iosClasses/**", @@ -1818,10 +1818,10 @@ HEADER_SEARCH_PATHS = ( "$(inherited)", "$(SRCROOT)/../node_modules/react-native-i18n/ios", - "$(SRCROOT)/../node_modules/react-native-spinkit/ios/**", + "$(SRCROOT)/../node_modules/react-native-spinkit-fix-new/ios/**", "$(SRCROOT)/../node_modules/react-native-vector-icons/RNVectorIconsManager", "$(SRCROOT)..\node_modules\nealmsrc/**", - "$(SRCROOT)/../node_modules/react-native-version-number/ios", + "$(SRCROOT)/../node_modules/react-native-version-number-fix-new/ios", "$(SRCROOT)..\node_modules\neact-native-image-crop-pickerios/**", "$(SRCROOT)..\node_moduleslottie-react-nativesrciosLottieReactNative", "$(SRCROOT)..\node_moduleslottie-ioslottie-iosClasses/**", diff --git a/package.json b/package.json index 4cc0489..018e7f0 100644 --- a/package.json +++ b/package.json @@ -28,11 +28,12 @@ "react-native-root-toast": "^2.2.0", "react-native-router-flux": "^4.0.6", "react-native-scrollable-tab-view-fix-guo": "^0.8.1", - "react-native-spinkit": "^1.1.1", + "react-native-spinkit-fix-new": "^1.1.2", "react-native-tab-view": "^1.0.2", "react-native-textinput-effects": "^0.4.1", "react-native-vector-icons": "^4.4.2", "react-native-version-number": "^0.3.4", + "react-native-version-number-fix-new": "^0.3.5", "react-navigation": "^2.18.2", "react-redux": "^5.0.7", "realm": "^2.10.0",