diff --git a/example/android/build.gradle b/example/android/build.gradle index f5195f5cf9d892ae479c61bdaa3e4366b04dbb1c..4ae317e4ef774d5254d9c43c28941dac12d832cc 100644 --- a/example/android/build.gradle +++ b/example/android/build.gradle @@ -1,6 +1,13 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { + ext { + buildToolsVersion = "28.0.3" + minSdkVersion = 16 + compileSdkVersion = 28 + targetSdkVersion = 28 + supportLibVersion = "28.0.0" + } repositories { google() mavenLocal() @@ -8,7 +15,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.2.1' + classpath 'com.android.tools.build:gradle:3.3.1' } } diff --git a/example/android/gradle/wrapper/gradle-wrapper.properties b/example/android/gradle/wrapper/gradle-wrapper.properties index 77c7721030e23d52b13c86910aa896bb4e0c391d..8cbe8db0c0796a21d70295df834aa17963e4c441 100644 --- a/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/example/android/gradle/wrapper/gradle-wrapper.properties @@ -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-4.6-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip diff --git a/example/android/myapplication/build.gradle b/example/android/myapplication/build.gradle index 215a039bd22bcde53266107aa452c56aacfb49fe..755d36b3a2696ab6519dac94f1aca47a55ee516c 100644 --- a/example/android/myapplication/build.gradle +++ b/example/android/myapplication/build.gradle @@ -1,13 +1,13 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 26 + compileSdkVersion 28 buildToolsVersion "28.0.3" defaultConfig { applicationId "com.wix.reactnativenotifications.app" minSdkVersion 19 - targetSdkVersion 26 + targetSdkVersion 28 versionCode 1 versionName "1.0" @@ -21,6 +21,10 @@ android { proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } + compileOptions { + sourceCompatibility 1.8 + targetCompatibility 1.8 + } } configurations.all { @@ -37,8 +41,8 @@ configurations.all { dependencies { // compile fileTree(dir: 'libs', include: ['*.jar']) - implementation 'com.android.support:appcompat-v7:26.1.0' - implementation 'com.android.support:design:26.1.0' + implementation 'com.android.support:appcompat-v7:28.0.0' + implementation 'com.android.support:design:28.0.0' implementation 'com.facebook.react:react-native:+' implementation project(':react-native-notifications') diff --git a/example/ios/NotificationsExampleApp.xcodeproj/project.pbxproj b/example/ios/NotificationsExampleApp.xcodeproj/project.pbxproj index 8c0a25370c047774ffa95a80f8ee236596fef597..b28d09330d04870f474e5d993fd218779f358e94 100644 --- a/example/ios/NotificationsExampleApp.xcodeproj/project.pbxproj +++ b/example/ios/NotificationsExampleApp.xcodeproj/project.pbxproj @@ -21,6 +21,7 @@ 13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; }; 146834051AC3E58100842450 /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 146834041AC3E56700842450 /* libReact.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 */; }; /* End PBXBuildFile section */ @@ -123,20 +124,6 @@ remoteGlobalIDString = 3D3CD9321DE5FBEE00167DC4; 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 */ = { isa = PBXContainerItemProxy; containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */; @@ -165,20 +152,6 @@ remoteGlobalIDString = 3D383D621EBD27B9005632C8; 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 */ = { isa = PBXContainerItemProxy; containerPortal = 00C302BB1ABCB91800DB3ED1 /* RCTImage.xcodeproj */; @@ -242,6 +215,48 @@ remoteGlobalIDString = 58B5119B1A9E6C1200147676; 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 */ = { isa = PBXContainerItemProxy; containerPortal = D85498C21D97B31100DEEE06 /* RNNotifications.xcodeproj */; @@ -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 = ""; }; 78C398B01ACF4ADC00677621 /* RCTLinking.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTLinking.xcodeproj; path = "../node_modules/react-native/Libraries/LinkingIOS/RCTLinking.xcodeproj"; sourceTree = ""; }; 832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTText.xcodeproj; path = "../node_modules/react-native/Libraries/Text/RCTText.xcodeproj"; sourceTree = ""; }; + 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 = ""; }; /* End PBXFileReference section */ @@ -280,6 +296,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + D84861182267695100E9103D /* JavaScriptCore.framework in Frameworks */, D85498D21D97B37F00DEEE06 /* libRNNotifications.a in Frameworks */, 146834051AC3E58100842450 /* libReact.a in Frameworks */, 00C302E51ABCBA2D00DB3ED1 /* libRCTActionSheet.a in Frameworks */, @@ -399,14 +416,16 @@ 18B556B02007789B007ACD82 /* libyoga.a */, 18B556B22007789B007ACD82 /* libcxxreact.a */, 18B556B42007789B007ACD82 /* libcxxreact.a */, - 18B556B62007789B007ACD82 /* libjschelpers.a */, - 18B556B82007789B007ACD82 /* libjschelpers.a */, + D848610B2267695100E9103D /* libjsinspector.a */, + D848610D2267695100E9103D /* libjsinspector-tvOS.a */, 18B556BA2007789B007ACD82 /* libthird-party.a */, 18B556BC2007789B007ACD82 /* libthird-party.a */, 18B556BE2007789B007ACD82 /* libdouble-conversion.a */, 18B556C02007789B007ACD82 /* libdouble-conversion.a */, - 18B556C22007789B007ACD82 /* libprivatedata.a */, - 18B556C42007789B007ACD82 /* libprivatedata-tvOS.a */, + D848610F2267695100E9103D /* libjsi.a */, + D84861112267695100E9103D /* libjsiexecutor.a */, + D84861132267695100E9103D /* libjsi-tvOS.a */, + D84861152267695100E9103D /* libjsiexecutor-tvOS.a */, ); name = Products; sourceTree = ""; @@ -454,6 +473,7 @@ 832341AE1AAA6A7D00B99B32 /* Libraries */, 00E356EF1AD99517003FC87E /* NotificationsExampleAppTests */, 83CBBA001A601CBA00E9B192 /* Products */, + D84860E82267695100E9103D /* Frameworks */, ); indentWidth = 2; sourceTree = ""; @@ -467,6 +487,14 @@ name = Products; sourceTree = ""; }; + D84860E82267695100E9103D /* Frameworks */ = { + isa = PBXGroup; + children = ( + D84861172267695100E9103D /* JavaScriptCore.framework */, + ); + name = Frameworks; + sourceTree = ""; + }; D85498C31D97B31100DEEE06 /* Products */ = { isa = PBXGroup; children = ( @@ -668,20 +696,6 @@ remoteRef = 18B556B32007789B007ACD82 /* PBXContainerItemProxy */; 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 */ = { isa = PBXReferenceProxy; fileType = archive.ar; @@ -710,20 +724,6 @@ remoteRef = 18B556BF2007789B007ACD82 /* PBXContainerItemProxy */; 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 */ = { isa = PBXReferenceProxy; fileType = archive.ar; @@ -787,6 +787,48 @@ remoteRef = 832341B41AAA6A8300B99B32 /* PBXContainerItemProxy */; 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 */ = { isa = PBXReferenceProxy; fileType = archive.ar; diff --git a/example/package.json b/example/package.json index ab19508749c8073b766cc0901a1b5379982d3ba2..59bc2798bb5f33b787aeca4600ee295ceeaa64c0 100644 --- a/example/package.json +++ b/example/package.json @@ -6,8 +6,8 @@ "start": "node node_modules/react-native/local-cli/cli.js start" }, "dependencies": { - "react": "16.6.0-alpha.8af6728", - "react-native": "^0.57.4", + "react": "16.8.3", + "react-native": "0.59.x", "react-native-notifications": "git://github.com/wix/react-native-notifications.git#iosDeprecationsFixes" } }