Skip to content

Commit

Permalink
Upgrade to React Native 0.56
Browse files Browse the repository at this point in the history
Implements zulip#2788

Upgrade dependencies, config and build files to RN 0.56

Previous upgrades were done manually by updating dependencies and
.flowconfig

This commit contains a full `diff` with previous versions.

What was done is:
 * run react-native-git-upgrade
 * resolve merge conflicts
 * update dependencies that were needed but missed by the script
  • Loading branch information
borisyankov committed Aug 2, 2018
1 parent 787c4a5 commit ec839ae
Show file tree
Hide file tree
Showing 13 changed files with 1,501 additions and 843 deletions.
15 changes: 14 additions & 1 deletion .flowconfig
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,19 @@ emoji=true
include_warnings=true

module.system=haste
module.system.haste.use_name_reducers=true
# get basename
module.system.haste.name_reducers='^.*/\([a-zA-Z0-9$_.-]+\.js\(\.flow\)?\)$' -> '\1'
# strip .js or .js.flow suffix
module.system.haste.name_reducers='^\(.*\)\.js\(\.flow\)?$' -> '\1'
# strip .ios suffix
module.system.haste.name_reducers='^\(.*\)\.ios$' -> '\1'
module.system.haste.name_reducers='^\(.*\)\.android$' -> '\1'
module.system.haste.name_reducers='^\(.*\)\.native$' -> '\1'
module.system.haste.paths.blacklist=.*/__tests__/.*
module.system.haste.paths.blacklist=.*/__mocks__/.*
module.system.haste.paths.blacklist=<PROJECT_ROOT>/node_modules/react-native/Libraries/Animated/src/polyfills/.*
module.system.haste.paths.whitelist=<PROJECT_ROOT>/node_modules/react-native/Libraries/.*

munge_underscores=true

Expand All @@ -80,4 +93,4 @@ suppress_comment=\\(.\\|\n\\)*\\$FlowFixedInNextDeploy
suppress_comment=\\(.\\|\n\\)*\\$FlowExpectedError

[version]
^0.67.0
^0.75.0
14 changes: 7 additions & 7 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -91,15 +91,15 @@ def enableSeparateBuildPerCPUArchitecture = false
def enableProguardInReleaseBuilds = false

android {
compileSdkVersion 23
buildToolsVersion "23.0.1"
compileSdkVersion rootProject.ext.compileSdkVersion
buildToolsVersion rootProject.ext.buildToolsVersion

defaultConfig {
applicationId "com.zulipmobile"
minSdkVersion 16
targetSdkVersion 22
versionCode 13
versionName "1.0.13"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1
versionName "1.0"
ndk {
abiFilters "armeabi-v7a", "x86"
}
Expand Down Expand Up @@ -178,7 +178,7 @@ dependencies {
compile project(':react-native-device-info')
compile project(':react-native-vector-icons')
compile fileTree(dir: "libs", include: ["*.jar"])
compile "com.android.support:appcompat-v7:23.0.1"
compile "com.android.support:appcompat-v7:${rootProject.ext.supportLibVersion}"
compile "me.leolin:ShortcutBadger:1.1.16@aar"
compile "com.facebook.react:react-native:+" // From node_modules
compile 'com.facebook.fresco:animated-gif:1.3.0' // For animated GIF support
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
18 changes: 17 additions & 1 deletion android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,13 @@
buildscript {
repositories {
jcenter()
maven {
url 'https://maven.google.com/'
name 'Google'
}
}
dependencies {
classpath 'com.android.tools.build:gradle:2.2.+'
classpath 'com.android.tools.build:gradle:2.3.3'

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
Expand All @@ -20,5 +24,17 @@ allprojects {
// All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
url "$rootDir/../node_modules/react-native/android"
}
maven {
url 'https://maven.google.com/'
name 'Google'
}
}
}

ext {
buildToolsVersion = "26.0.3"
minSdkVersion = 16
compileSdkVersion = 26
targetSdkVersion = 26
supportLibVersion = "26.1.0"
}
2 changes: 1 addition & 1 deletion android/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-3.5.1-all.zip
8 changes: 4 additions & 4 deletions ios/ZulipMobile.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -1710,7 +1710,7 @@
"$(SRCROOT)/../node_modules/react-native-image-picker/ios",
);
INFOPLIST_FILE = ZulipMobileTests/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 8.2;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
Expand Down Expand Up @@ -1761,7 +1761,7 @@
"$(SRCROOT)/../node_modules/react-native-image-picker/ios",
);
INFOPLIST_FILE = ZulipMobileTests/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 8.2;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
Expand Down Expand Up @@ -1917,7 +1917,7 @@
"$(SRCROOT)/../node_modules/react-native-vector-icons/RNVectorIconsManager",
"$(SRCROOT)/../node_modules/react-native-device-info/RNDeviceInfo",
);
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
PRODUCT_BUNDLE_IDENTIFIER = org.zulip.ZulipMobile;
Expand Down Expand Up @@ -1963,7 +1963,7 @@
"$(SRCROOT)/../node_modules/react-native-vector-icons/RNVectorIconsManager",
"$(SRCROOT)/../node_modules/react-native-device-info/RNDeviceInfo",
);
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
MTL_ENABLE_DEBUG_INFO = NO;
PRODUCT_BUNDLE_IDENTIFIER = org.zulip.ZulipMobile;
SDKROOT = iphoneos;
Expand Down
16 changes: 8 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@
"lodash.throttle": "^4.1.1",
"lodash.unescape": "^4.0.1",
"lodash.uniqby": "^4.4.0",
"react": "16.3.2",
"react": "16.4.1",
"react-intl": "^2.4.0",
"react-native": "^0.55.4",
"react-native": "0.56.0",
"react-native-device-info": "^0.21.5",
"react-native-fetch-blob": "^0.10.8",
"react-native-image-picker": "^0.26.10",
Expand All @@ -61,7 +61,7 @@
"react-navigation": "^1.5.12",
"react-navigation-redux-helpers": "^1.1.1",
"react-redux": "^5.0.7",
"react-test-renderer": "16.3.2",
"react-test-renderer": "16.4.1",
"redux": "^4.0.0",
"redux-action-buffer": "^1.2.0",
"redux-batched-actions": "^0.3.0",
Expand All @@ -78,9 +78,9 @@
"devDependencies": {
"babel-core": "^6.26.3",
"babel-eslint": "^8.2.3",
"babel-jest": "^22.4.4",
"babel-jest": "^23.4.0",
"babel-plugin-transform-remove-console": "^6.9.4",
"babel-preset-react-native": "^4.0.0",
"babel-preset-react-native": "^5",
"coveralls": "^3.0.1",
"deep-freeze": "^0.0.1",
"detox": "^7.3.7",
Expand All @@ -96,11 +96,11 @@
"eslint-plugin-react": "^7.8.2",
"eslint-plugin-react-native": "^3.2.1",
"eslint-plugin-spellcheck": "0.0.6",
"flow-bin": "^0.67.0",
"flow-bin": "0.75",
"flow-coverage-report": "^0.5.0",
"flow-typed": "^2.4.0",
"jest": "^22.4.4",
"jest-cli": "^22.4.4",
"jest": "^23.4.0",
"jest-cli": "^23.4.0",
"jest-react-native": "^18.0.0",
"prettier": "^1.12.1",
"prettier-eslint": "^8.8.1",
Expand Down
Loading

0 comments on commit ec839ae

Please sign in to comment.