Commit df5b89e8 authored by Artal Druk's avatar Artal Druk

example project: upgrade to RN 0.59

parent 498dd34b
// Top-level build file where you can add configuration options common to all sub-projects/modules. // Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript { buildscript {
ext {
buildToolsVersion = "28.0.3"
minSdkVersion = 16
compileSdkVersion = 28
targetSdkVersion = 28
supportLibVersion = "28.0.0"
}
repositories { repositories {
google() google()
mavenLocal() mavenLocal()
...@@ -8,7 +15,7 @@ buildscript { ...@@ -8,7 +15,7 @@ buildscript {
jcenter() jcenter()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:3.2.1' classpath 'com.android.tools.build:gradle:3.3.1'
} }
} }
......
...@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME ...@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
apply plugin: 'com.android.application' apply plugin: 'com.android.application'
android { android {
compileSdkVersion 26 compileSdkVersion 28
buildToolsVersion "28.0.3" buildToolsVersion "28.0.3"
defaultConfig { defaultConfig {
applicationId "com.wix.reactnativenotifications.app" applicationId "com.wix.reactnativenotifications.app"
minSdkVersion 19 minSdkVersion 19
targetSdkVersion 26 targetSdkVersion 28
versionCode 1 versionCode 1
versionName "1.0" versionName "1.0"
...@@ -21,6 +21,10 @@ android { ...@@ -21,6 +21,10 @@ android {
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
} }
} }
compileOptions {
sourceCompatibility 1.8
targetCompatibility 1.8
}
} }
configurations.all { configurations.all {
...@@ -37,8 +41,8 @@ configurations.all { ...@@ -37,8 +41,8 @@ configurations.all {
dependencies { dependencies {
// compile fileTree(dir: 'libs', include: ['*.jar']) // compile fileTree(dir: 'libs', include: ['*.jar'])
implementation 'com.android.support:appcompat-v7:26.1.0' implementation 'com.android.support:appcompat-v7:28.0.0'
implementation 'com.android.support:design:26.1.0' implementation 'com.android.support:design:28.0.0'
implementation 'com.facebook.react:react-native:+' implementation 'com.facebook.react:react-native:+'
implementation project(':react-native-notifications') implementation project(':react-native-notifications')
......
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; }; 13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
146834051AC3E58100842450 /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 146834041AC3E56700842450 /* libReact.a */; }; 146834051AC3E58100842450 /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 146834041AC3E56700842450 /* libReact.a */; };
832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 832341B51AAA6A8300B99B32 /* libRCTText.a */; }; 832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 832341B51AAA6A8300B99B32 /* libRCTText.a */; };
D84861182267695100E9103D /* JavaScriptCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D84861172267695100E9103D /* JavaScriptCore.framework */; };
D85498D21D97B37F00DEEE06 /* libRNNotifications.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D85498D11D97B31100DEEE06 /* libRNNotifications.a */; }; D85498D21D97B37F00DEEE06 /* libRNNotifications.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D85498D11D97B31100DEEE06 /* libRNNotifications.a */; };
/* End PBXBuildFile section */ /* End PBXBuildFile section */
...@@ -123,20 +124,6 @@ ...@@ -123,20 +124,6 @@
remoteGlobalIDString = 3D3CD9321DE5FBEE00167DC4; remoteGlobalIDString = 3D3CD9321DE5FBEE00167DC4;
remoteInfo = "cxxreact-tvOS"; remoteInfo = "cxxreact-tvOS";
}; };
18B556B52007789B007ACD82 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 3D3CD90B1DE5FBD600167DC4;
remoteInfo = jschelpers;
};
18B556B72007789B007ACD82 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 3D3CD9181DE5FBD800167DC4;
remoteInfo = "jschelpers-tvOS";
};
18B556B92007789B007ACD82 /* PBXContainerItemProxy */ = { 18B556B92007789B007ACD82 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy; isa = PBXContainerItemProxy;
containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */; containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
...@@ -165,20 +152,6 @@ ...@@ -165,20 +152,6 @@
remoteGlobalIDString = 3D383D621EBD27B9005632C8; remoteGlobalIDString = 3D383D621EBD27B9005632C8;
remoteInfo = "double-conversion-tvOS"; remoteInfo = "double-conversion-tvOS";
}; };
18B556C12007789B007ACD82 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 9936F3131F5F2E4B0010BF04;
remoteInfo = privatedata;
};
18B556C32007789B007ACD82 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 9936F32F1F5F2E5B0010BF04;
remoteInfo = "privatedata-tvOS";
};
18BA9BF01DEC2288001F416D /* PBXContainerItemProxy */ = { 18BA9BF01DEC2288001F416D /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy; isa = PBXContainerItemProxy;
containerPortal = 00C302BB1ABCB91800DB3ED1 /* RCTImage.xcodeproj */; containerPortal = 00C302BB1ABCB91800DB3ED1 /* RCTImage.xcodeproj */;
...@@ -242,6 +215,48 @@ ...@@ -242,6 +215,48 @@
remoteGlobalIDString = 58B5119B1A9E6C1200147676; remoteGlobalIDString = 58B5119B1A9E6C1200147676;
remoteInfo = RCTText; remoteInfo = RCTText;
}; };
D848610A2267695100E9103D /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = EBF21BDC1FC498900052F4D5;
remoteInfo = jsinspector;
};
D848610C2267695100E9103D /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = EBF21BFA1FC4989A0052F4D5;
remoteInfo = "jsinspector-tvOS";
};
D848610E2267695100E9103D /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = EDEBC6D6214B3E7000DD5AC8;
remoteInfo = jsi;
};
D84861102267695100E9103D /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = EDEBC73B214B45A300DD5AC8;
remoteInfo = jsiexecutor;
};
D84861122267695100E9103D /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = ED296FB6214C9A0900B7C4FE;
remoteInfo = "jsi-tvOS";
};
D84861142267695100E9103D /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = ED296FEE214C9CF800B7C4FE;
remoteInfo = "jsiexecutor-tvOS";
};
D85498D01D97B31100DEEE06 /* PBXContainerItemProxy */ = { D85498D01D97B31100DEEE06 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy; isa = PBXContainerItemProxy;
containerPortal = D85498C21D97B31100DEEE06 /* RNNotifications.xcodeproj */; containerPortal = D85498C21D97B31100DEEE06 /* RNNotifications.xcodeproj */;
...@@ -272,6 +287,7 @@ ...@@ -272,6 +287,7 @@
146833FF1AC3E56700842450 /* React.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = React.xcodeproj; path = "../node_modules/react-native/React/React.xcodeproj"; sourceTree = "<group>"; }; 146833FF1AC3E56700842450 /* React.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = React.xcodeproj; path = "../node_modules/react-native/React/React.xcodeproj"; sourceTree = "<group>"; };
78C398B01ACF4ADC00677621 /* RCTLinking.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTLinking.xcodeproj; path = "../node_modules/react-native/Libraries/LinkingIOS/RCTLinking.xcodeproj"; sourceTree = "<group>"; }; 78C398B01ACF4ADC00677621 /* RCTLinking.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTLinking.xcodeproj; path = "../node_modules/react-native/Libraries/LinkingIOS/RCTLinking.xcodeproj"; sourceTree = "<group>"; };
832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTText.xcodeproj; path = "../node_modules/react-native/Libraries/Text/RCTText.xcodeproj"; sourceTree = "<group>"; }; 832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTText.xcodeproj; path = "../node_modules/react-native/Libraries/Text/RCTText.xcodeproj"; sourceTree = "<group>"; };
D84861172267695100E9103D /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; };
D85498C21D97B31100DEEE06 /* RNNotifications.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RNNotifications.xcodeproj; path = ../../RNNotifications/RNNotifications.xcodeproj; sourceTree = "<group>"; }; D85498C21D97B31100DEEE06 /* RNNotifications.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RNNotifications.xcodeproj; path = ../../RNNotifications/RNNotifications.xcodeproj; sourceTree = "<group>"; };
/* End PBXFileReference section */ /* End PBXFileReference section */
...@@ -280,6 +296,7 @@ ...@@ -280,6 +296,7 @@
isa = PBXFrameworksBuildPhase; isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647; buildActionMask = 2147483647;
files = ( files = (
D84861182267695100E9103D /* JavaScriptCore.framework in Frameworks */,
D85498D21D97B37F00DEEE06 /* libRNNotifications.a in Frameworks */, D85498D21D97B37F00DEEE06 /* libRNNotifications.a in Frameworks */,
146834051AC3E58100842450 /* libReact.a in Frameworks */, 146834051AC3E58100842450 /* libReact.a in Frameworks */,
00C302E51ABCBA2D00DB3ED1 /* libRCTActionSheet.a in Frameworks */, 00C302E51ABCBA2D00DB3ED1 /* libRCTActionSheet.a in Frameworks */,
...@@ -399,14 +416,16 @@ ...@@ -399,14 +416,16 @@
18B556B02007789B007ACD82 /* libyoga.a */, 18B556B02007789B007ACD82 /* libyoga.a */,
18B556B22007789B007ACD82 /* libcxxreact.a */, 18B556B22007789B007ACD82 /* libcxxreact.a */,
18B556B42007789B007ACD82 /* libcxxreact.a */, 18B556B42007789B007ACD82 /* libcxxreact.a */,
18B556B62007789B007ACD82 /* libjschelpers.a */, D848610B2267695100E9103D /* libjsinspector.a */,
18B556B82007789B007ACD82 /* libjschelpers.a */, D848610D2267695100E9103D /* libjsinspector-tvOS.a */,
18B556BA2007789B007ACD82 /* libthird-party.a */, 18B556BA2007789B007ACD82 /* libthird-party.a */,
18B556BC2007789B007ACD82 /* libthird-party.a */, 18B556BC2007789B007ACD82 /* libthird-party.a */,
18B556BE2007789B007ACD82 /* libdouble-conversion.a */, 18B556BE2007789B007ACD82 /* libdouble-conversion.a */,
18B556C02007789B007ACD82 /* libdouble-conversion.a */, 18B556C02007789B007ACD82 /* libdouble-conversion.a */,
18B556C22007789B007ACD82 /* libprivatedata.a */, D848610F2267695100E9103D /* libjsi.a */,
18B556C42007789B007ACD82 /* libprivatedata-tvOS.a */, D84861112267695100E9103D /* libjsiexecutor.a */,
D84861132267695100E9103D /* libjsi-tvOS.a */,
D84861152267695100E9103D /* libjsiexecutor-tvOS.a */,
); );
name = Products; name = Products;
sourceTree = "<group>"; sourceTree = "<group>";
...@@ -454,6 +473,7 @@ ...@@ -454,6 +473,7 @@
832341AE1AAA6A7D00B99B32 /* Libraries */, 832341AE1AAA6A7D00B99B32 /* Libraries */,
00E356EF1AD99517003FC87E /* NotificationsExampleAppTests */, 00E356EF1AD99517003FC87E /* NotificationsExampleAppTests */,
83CBBA001A601CBA00E9B192 /* Products */, 83CBBA001A601CBA00E9B192 /* Products */,
D84860E82267695100E9103D /* Frameworks */,
); );
indentWidth = 2; indentWidth = 2;
sourceTree = "<group>"; sourceTree = "<group>";
...@@ -467,6 +487,14 @@ ...@@ -467,6 +487,14 @@
name = Products; name = Products;
sourceTree = "<group>"; sourceTree = "<group>";
}; };
D84860E82267695100E9103D /* Frameworks */ = {
isa = PBXGroup;
children = (
D84861172267695100E9103D /* JavaScriptCore.framework */,
);
name = Frameworks;
sourceTree = "<group>";
};
D85498C31D97B31100DEEE06 /* Products */ = { D85498C31D97B31100DEEE06 /* Products */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
...@@ -668,20 +696,6 @@ ...@@ -668,20 +696,6 @@
remoteRef = 18B556B32007789B007ACD82 /* PBXContainerItemProxy */; remoteRef = 18B556B32007789B007ACD82 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR; sourceTree = BUILT_PRODUCTS_DIR;
}; };
18B556B62007789B007ACD82 /* libjschelpers.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = libjschelpers.a;
remoteRef = 18B556B52007789B007ACD82 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
18B556B82007789B007ACD82 /* libjschelpers.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = libjschelpers.a;
remoteRef = 18B556B72007789B007ACD82 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
18B556BA2007789B007ACD82 /* libthird-party.a */ = { 18B556BA2007789B007ACD82 /* libthird-party.a */ = {
isa = PBXReferenceProxy; isa = PBXReferenceProxy;
fileType = archive.ar; fileType = archive.ar;
...@@ -710,20 +724,6 @@ ...@@ -710,20 +724,6 @@
remoteRef = 18B556BF2007789B007ACD82 /* PBXContainerItemProxy */; remoteRef = 18B556BF2007789B007ACD82 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR; sourceTree = BUILT_PRODUCTS_DIR;
}; };
18B556C22007789B007ACD82 /* libprivatedata.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = libprivatedata.a;
remoteRef = 18B556C12007789B007ACD82 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
18B556C42007789B007ACD82 /* libprivatedata-tvOS.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = "libprivatedata-tvOS.a";
remoteRef = 18B556C32007789B007ACD82 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
18BA9BF11DEC2288001F416D /* libRCTImage-tvOS.a */ = { 18BA9BF11DEC2288001F416D /* libRCTImage-tvOS.a */ = {
isa = PBXReferenceProxy; isa = PBXReferenceProxy;
fileType = archive.ar; fileType = archive.ar;
...@@ -787,6 +787,48 @@ ...@@ -787,6 +787,48 @@
remoteRef = 832341B41AAA6A8300B99B32 /* PBXContainerItemProxy */; remoteRef = 832341B41AAA6A8300B99B32 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR; sourceTree = BUILT_PRODUCTS_DIR;
}; };
D848610B2267695100E9103D /* libjsinspector.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = libjsinspector.a;
remoteRef = D848610A2267695100E9103D /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
D848610D2267695100E9103D /* libjsinspector-tvOS.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = "libjsinspector-tvOS.a";
remoteRef = D848610C2267695100E9103D /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
D848610F2267695100E9103D /* libjsi.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = libjsi.a;
remoteRef = D848610E2267695100E9103D /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
D84861112267695100E9103D /* libjsiexecutor.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = libjsiexecutor.a;
remoteRef = D84861102267695100E9103D /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
D84861132267695100E9103D /* libjsi-tvOS.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = "libjsi-tvOS.a";
remoteRef = D84861122267695100E9103D /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
D84861152267695100E9103D /* libjsiexecutor-tvOS.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = "libjsiexecutor-tvOS.a";
remoteRef = D84861142267695100E9103D /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
D85498D11D97B31100DEEE06 /* libRNNotifications.a */ = { D85498D11D97B31100DEEE06 /* libRNNotifications.a */ = {
isa = PBXReferenceProxy; isa = PBXReferenceProxy;
fileType = archive.ar; fileType = archive.ar;
......
...@@ -6,8 +6,8 @@ ...@@ -6,8 +6,8 @@
"start": "node node_modules/react-native/local-cli/cli.js start" "start": "node node_modules/react-native/local-cli/cli.js start"
}, },
"dependencies": { "dependencies": {
"react": "16.6.0-alpha.8af6728", "react": "16.8.3",
"react-native": "^0.57.4", "react-native": "0.59.x",
"react-native-notifications": "git://github.com/wix/react-native-notifications.git#iosDeprecationsFixes" "react-native-notifications": "git://github.com/wix/react-native-notifications.git#iosDeprecationsFixes"
} }
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment