Browse Source

update gradle and remove weird entry point (#2330)

Daniel Zlotin 6 years ago
parent
commit
fe6f90b093
No account linked to committer's email address

+ 0
- 1
index.android.js View File

1
-require('./playground/index');

+ 0
- 1
index.ios.js View File

1
-require('./playground/index');

+ 1
- 1
lib/android/app/build.gradle View File

3
 
3
 
4
 android {
4
 android {
5
     compileSdkVersion 25
5
     compileSdkVersion 25
6
-    buildToolsVersion "25.0.3"
6
+    buildToolsVersion "27.0.1"
7
 
7
 
8
     defaultConfig {
8
     defaultConfig {
9
         minSdkVersion 16
9
         minSdkVersion 16

+ 6
- 1
lib/android/build.gradle View File

2
 
2
 
3
 buildscript {
3
 buildscript {
4
     repositories {
4
     repositories {
5
+        mavenLocal()
6
+        mavenCentral()
7
+        google()
5
         jcenter()
8
         jcenter()
6
     }
9
     }
7
     dependencies {
10
     dependencies {
8
-        classpath 'com.android.tools.build:gradle:2.3.0'
11
+        classpath 'com.android.tools.build:gradle:3.0.1'
9
 
12
 
10
         // NOTE: Do not place your application dependencies here; they belong
13
         // NOTE: Do not place your application dependencies here; they belong
11
         // in the individual module build.gradle files
14
         // in the individual module build.gradle files
15
 allprojects {
18
 allprojects {
16
     repositories {
19
     repositories {
17
         mavenLocal()
20
         mavenLocal()
21
+        mavenCentral()
22
+        google()
18
         jcenter()
23
         jcenter()
19
         maven {
24
         maven {
20
             // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
25
             // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm

+ 5
- 0
lib/android/gradle.properties View File

16
 # This option should only be used with decoupled projects. More details, visit
16
 # This option should only be used with decoupled projects. More details, visit
17
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
17
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
18
 # org.gradle.parallel=true
18
 # org.gradle.parallel=true
19
+
20
+# Disable incremental resource processing as it broke relase build
21
+# https://github.com/react-community/react-navigation/issues/1976
22
+# https://developer.android.com/studio/build/gradle-plugin-3-0-0.html
23
+android.enableAapt2=false

+ 1
- 1
playground/android/app/build.gradle View File

9
 
9
 
10
 android {
10
 android {
11
     compileSdkVersion 25
11
     compileSdkVersion 25
12
-    buildToolsVersion "25.0.3"
12
+    buildToolsVersion "27.0.1"
13
 
13
 
14
     defaultConfig {
14
     defaultConfig {
15
         applicationId "com.reactnativenavigation.playground"
15
         applicationId "com.reactnativenavigation.playground"

+ 5
- 3
playground/android/build.gradle View File

2
 
2
 
3
 buildscript {
3
 buildscript {
4
     repositories {
4
     repositories {
5
-        jcenter()
5
+        mavenLocal()
6
+        mavenCentral()
6
         google()
7
         google()
8
+        jcenter()
7
     }
9
     }
8
     dependencies {
10
     dependencies {
9
         classpath 'com.android.tools.build:gradle:3.0.1'
11
         classpath 'com.android.tools.build:gradle:3.0.1'
15
 
17
 
16
 allprojects {
18
 allprojects {
17
     repositories {
19
     repositories {
18
-        jcenter()
19
-        google()
20
         mavenLocal()
20
         mavenLocal()
21
         mavenCentral()
21
         mavenCentral()
22
+        google()
23
+        jcenter()
22
         maven {
24
         maven {
23
             // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
25
             // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
24
             url "$rootDir/../../node_modules/react-native/android"
26
             url "$rootDir/../../node_modules/react-native/android"

+ 4
- 0
playground/android/gradle.properties View File

18
 # org.gradle.parallel=true
18
 # org.gradle.parallel=true
19
 
19
 
20
 android.useDeprecatedNdk=false
20
 android.useDeprecatedNdk=false
21
+# Disable incremental resource processing as it broke relase build
22
+# https://github.com/react-community/react-navigation/issues/1976
23
+# https://developer.android.com/studio/build/gradle-plugin-3-0-0.html
24
+android.enableAapt2=false

+ 1
- 1
playground/android/gradle/wrapper/gradle-wrapper.properties View File

3
 distributionPath=wrapper/dists
3
 distributionPath=wrapper/dists
4
 zipStoreBase=GRADLE_USER_HOME
4
 zipStoreBase=GRADLE_USER_HOME
5
 zipStorePath=wrapper/dists
5
 zipStorePath=wrapper/dists
6
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.3.1-bin.zip
6
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-bin.zip

+ 1
- 1
scripts/start.js View File

6
   exec.killPort(8081);
6
   exec.killPort(8081);
7
   exec.execSync(`watchman watch-del-all || true`);
7
   exec.execSync(`watchman watch-del-all || true`);
8
   exec.execSync(`adb reverse tcp:8081 tcp:8081 || true`);
8
   exec.execSync(`adb reverse tcp:8081 tcp:8081 || true`);
9
-  exec.execSync(`node ./node_modules/react-native/local-cli/cli.js start`);
9
+  exec.execSync(`node ./node_modules/react-native/local-cli/cli.js start --root ./playground/`);
10
 }
10
 }