upgrade sampleDemo

package.json

@@ -34,17 +34,16 @@
   },
   "homepage": "https://github.com/syanbo/react-native-agora#readme",
   "peerDependencies": {
-    "react": "16.3.0",
-    "react-native": "0.57.8",
-    "tslib": "latest"
+    "react": ">=16.7.0",
+    "react-native": ">=0.58.3"
   },
   "devDependencies": {
-    "react": "^16.7.0",
-    "react-native": "^0.58.3",
     "@types/jest": "^23.3.13",
     "@types/react": "^16.7.20",
     "@types/react-native": "^0.57.31",
     "@types/react-test-renderer": "^16.0.3",
+    "react": "16.7.0",
+    "react-native": "0.58.3",
     "react-native-typescript-transformer": "^1.2.11",
     "ts-jest": "^23.10.5",
     "tslint": "^5.12.1",
@@ -70,5 +69,8 @@
       "<rootDir>/node_modules/"
     ],
     "cacheDirectory": ".jest/cache"
+  },
+  "dependencies": {
+    "tslib": "^1.9.3"
   }
 }

samples/simpleDemo/android/app/build.gradle

@@ -137,7 +137,6 @@ android {
 }
 
 dependencies {
-    compile project(':react-native-agora')
     implementation fileTree(dir: "libs", include: ["*.jar"])
     implementation "com.android.support:appcompat-v7:${rootProject.ext.supportLibVersion}"
     implementation "com.facebook.react:react-native:+"  // From node_modules

samples/simpleDemo/android/app/src/main/AndroidManifest.xml

@@ -8,7 +8,7 @@
       android:name=".MainApplication"
       android:label="@string/app_name"
       android:icon="@mipmap/ic_launcher"
-      android:allowBackup="true"
+      android:allowBackup="false"
       android:theme="@style/AppTheme">
       <activity
         android:name=".MainActivity"

samples/simpleDemo/android/app/src/main/java/com/simpledemo/MainApplication.java

@@ -3,7 +3,6 @@ package com.simpledemo;
 import android.app.Application;
 
 import com.facebook.react.ReactApplication;
-import com.syan.agora.AgoraPackage;
 import com.facebook.react.ReactNativeHost;
 import com.facebook.react.ReactPackage;
 import com.facebook.react.shell.MainReactPackage;
@@ -23,8 +22,7 @@ public class MainApplication extends Application implements ReactApplication {
     @Override
     protected List<ReactPackage> getPackages() {
       return Arrays.<ReactPackage>asList(
-          new MainReactPackage(),
-            new AgoraPackage()
+          new MainReactPackage()
       );
     }
 

samples/simpleDemo/android/build.gradle

@@ -37,14 +37,3 @@ task wrapper(type: Wrapper) {
     gradleVersion = '4.4'
     distributionUrl = distributionUrl.replace("bin", "all")
 }
-
-subprojects {
-    afterEvaluate {project ->
-        if (project.hasProperty("android")) {
-            android {
-                compileSdkVersion 27
-                buildToolsVersion "27.0.3"
-            }
-        }
-    }
-}

samples/simpleDemo/android/settings.gradle

@@ -1,5 +1,3 @@
 rootProject.name = 'simpleDemo'
-include ':react-native-agora'
-project(':react-native-agora').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-agora/android')
 
 include ':app'

samples/simpleDemo/ios/Podfile

@@ -15,6 +15,7 @@ target 'simpleDemo' do
   %w(DoubleConversion Folly glog).each do |lib_name|
     pod lib_name, podspec: "#{react_native_path}/third-party-podspecs/#{lib_name}.podspec"
   end
+  #pod 'AgoraRtcEngine_iOS', '2.3.3'
   target 'simpleDemoTests' do
     inherit! :search_paths
     # Pods for testing

samples/simpleDemo/ios/Podfile.lock

@@ -55,9 +55,9 @@ SPEC CHECKSUMS:
   Folly: c89ac2d5c6ab169cd7397ef27485c44f35f742c7
   glog: e8acf0ebbf99759d3ff18c86c292a5898282dcde
   React: 1fe0eb13d90b625d94c3b117c274dcfd2e760e11
-  react-native-agora: 9a1e39cad840c86ad542fc3834824f9e031ae376
+  react-native-agora: ad43868aad1298fa32f167d9a00887e2c88af54b
   yoga: b1ce48b6cf950b98deae82838f5173ea7cf89e85
 
-PODFILE CHECKSUM: d5a5e2217f8f5a968a621c228e072b287bf5380b
+PODFILE CHECKSUM: a165c0bfbdd660ff2132e775c48c7a2e58dd3cf7
 
 COCOAPODS: 1.5.3

samples/simpleDemo/ios/simpleDemo.xcodeproj/xcshareddata/xcschemes/simpleDemo-tvOS.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1010"
+   LastUpgradeVersion = "0940"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "NO"

samples/simpleDemo/ios/simpleDemo.xcodeproj/xcshareddata/xcschemes/simpleDemo.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1010"
+   LastUpgradeVersion = "0940"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "NO"

samples/simpleDemo/ios/simpleDemo/Images.xcassets/AppIcon.appiconset/Contents.json

@@ -1,15 +1,5 @@
 {
   "images" : [
-    {
-      "idiom" : "iphone",
-      "size" : "20x20",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "iphone",
-      "size" : "20x20",
-      "scale" : "3x"
-    },
     {
       "idiom" : "iphone",
       "size" : "29x29",
@@ -39,11 +29,6 @@
       "idiom" : "iphone",
       "size" : "60x60",
       "scale" : "3x"
-    },
-    {
-      "idiom" : "ios-marketing",
-      "size" : "1024x1024",
-      "scale" : "1x"
     }
   ],
   "info" : {

samples/simpleDemo/ios/simpleDemo/Info.plist

@@ -24,29 +24,8 @@
 	<string>1</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
-	<key>NSAppTransportSecurity</key>
-	<dict>
-		<key>NSAllowsArbitraryLoads</key>
-		<true/>
-		<key>NSExceptionDomains</key>
-		<dict>
-			<key>localhost</key>
-			<dict>
-				<key>NSExceptionAllowsInsecureHTTPLoads</key>
-				<true/>
-			</dict>
-		</dict>
-	</dict>
-	<key>NSCameraUsageDescription</key>
-	<string>use camera for agora video call</string>
 	<key>NSLocationWhenInUseUsageDescription</key>
 	<string></string>
-	<key>NSMicrophoneUsageDescription</key>
-	<string>use microphone for agora video call</string>
-	<key>UIBackgroundModes</key>
-	<array>
-		<string>audio</string>
-	</array>
 	<key>UILaunchStoryboardName</key>
 	<string>LaunchScreen</string>
 	<key>UIRequiredDeviceCapabilities</key>
@@ -61,5 +40,21 @@
 	</array>
 	<key>UIViewControllerBasedStatusBarAppearance</key>
 	<false/>
+	<key>NSLocationWhenInUseUsageDescription</key>
+	<string></string>
+	<key>NSAppTransportSecurity</key>
+	<!--See http://ste.vn/2015/06/10/configuring-app-transport-security-ios-9-osx-10-11/ -->
+	<dict>
+    <key>NSAllowsArbitraryLoads</key>
+    <true/>
+		<key>NSExceptionDomains</key>
+		<dict>
+			<key>localhost</key>
+			<dict>
+				<key>NSExceptionAllowsInsecureHTTPLoads</key>
+				<true/>
+			</dict>
+		</dict>
+	</dict>
 </dict>
 </plist>

samples/simpleDemo/yarn.lock

@@ -694,9 +694,9 @@ acorn@^6.0.1:
   integrity sha1-zXUYFnDVuZvbGxyZOUHTojmrH1Y=
 
 ajv@^6.5.5:
-  version "6.7.0"
-  resolved "http://registry.npm.taobao.org/ajv/download/ajv-6.7.0.tgz#e3ce7bb372d6577bb1839f1dfdfcbf5ad2948d96"
-  integrity sha1-4857s3LWV3uxg58d/fy/WtKUjZY=
+  version "6.8.1"
+  resolved "http://registry.npm.taobao.org/ajv/download/ajv-6.8.1.tgz#0890b93742985ebf8973cd365c5b23920ce3cb20"
+  integrity sha1-CJC5N0KYXr+Jc802XFsjkgzjyyA=
   dependencies:
     fast-deep-equal "^2.0.1"
     fast-json-stable-stringify "^2.0.0"
@@ -4545,6 +4545,8 @@ react-is@^16.6.3:
 
 "react-native-agora@file:../..":
   version "2.3.3"
+  dependencies:
+    tslib "^1.9.3"
 
 react-native@0.57.8:
   version "0.57.8"
@@ -5498,6 +5500,11 @@ trim-right@^1.0.1:
   resolved "http://registry.npm.taobao.org/trim-right/download/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003"
   integrity sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=
 
+tslib@^1.9.3:
+  version "1.9.3"
+  resolved "http://registry.npm.taobao.org/tslib/download/tslib-1.9.3.tgz#d7e4dd79245d85428c4d7e4822a79917954ca286"
+  integrity sha1-1+TdeSRdhUKMTX5IIqeZF5VMooY=
+
 tunnel-agent@^0.6.0:
   version "0.6.0"
   resolved "http://registry.npm.taobao.org/tunnel-agent/download/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"

yarn.lock

@@ -6039,7 +6039,7 @@ ts-jest@^23.10.5:
     semver "^5.5"
     yargs-parser "10.x"
 
-tslib@^1.8.0, tslib@^1.8.1:
+tslib@^1.8.0, tslib@^1.8.1, tslib@^1.9.3:
   version "1.9.3"
   resolved "http://registry.npm.taobao.org/tslib/download/tslib-1.9.3.tgz#d7e4dd79245d85428c4d7e4822a79917954ca286"
   integrity sha1-1+TdeSRdhUKMTX5IIqeZF5VMooY=