Browse Source

Fix gradle setup

Mathieu Acthernoene 5 years ago
parent
commit
373fbd8f5c
4 changed files with 3313 additions and 126 deletions
  1. 3
    1
      .editorconfig
  2. 43
    14
      android/build.gradle
  3. 12
    9
      package.json
  4. 3255
    102
      yarn.lock

+ 3
- 1
.editorconfig View File

@@ -2,11 +2,13 @@ root = true
2 2
 
3 3
 [*]
4 4
 charset = utf-8
5
-end_of_line = lf
6 5
 indent_size = 2
7 6
 indent_style = space
8 7
 insert_final_newline = true
9 8
 trim_trailing_whitespace = true
10 9
 
10
+[*.gradle]
11
+indent_size = 4
12
+
11 13
 [*.md]
12 14
 trim_trailing_whitespace = false

+ 43
- 14
android/build.gradle View File

@@ -1,22 +1,51 @@
1
-apply plugin: 'com.android.library'
2
-
3 1
 def safeExtGet(prop, fallback) {
4
-  rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
2
+    rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
3
+}
4
+
5
+buildscript {
6
+    // The Android Gradle plugin is only required when opening the android folder stand-alone.
7
+    // This avoids unnecessary downloads and potential conflicts when the library is included as a
8
+    // module dependency in an application project.
9
+    if (project == rootProject) {
10
+        repositories {
11
+            google()
12
+            jcenter()
13
+        }
14
+        dependencies {
15
+            classpath 'com.android.tools.build:gradle:3.5.0'
16
+        }
17
+    }
5 18
 }
6 19
 
20
+apply plugin: 'com.android.library'
21
+
7 22
 android {
8
-  compileSdkVersion safeExtGet('compileSdkVersion', 28)
9
-  buildToolsVersion safeExtGet('buildToolsVersion', '28.0.3')
10
-  defaultConfig {
11
-    minSdkVersion safeExtGet('minSdkVersion', 16)
12
-    targetSdkVersion safeExtGet('targetSdkVersion', 28)
13
-  }
14
-  lintOptions {
15
-    abortOnError false
16
-  }
23
+    compileSdkVersion safeExtGet('compileSdkVersion', 28)
24
+    buildToolsVersion safeExtGet('buildToolsVersion', '28.0.3')
25
+    defaultConfig {
26
+        minSdkVersion safeExtGet('minSdkVersion', 16)
27
+        targetSdkVersion safeExtGet('targetSdkVersion', 28)
28
+    }
29
+    lintOptions {
30
+        abortOnError false
31
+    }
32
+}
33
+
34
+repositories {
35
+    mavenLocal()
36
+    maven {
37
+        // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
38
+        url "$rootDir/../node_modules/react-native/android"
39
+    }
40
+    maven {
41
+        // Android JSC is installed from npm
42
+        url "$rootDir/../node_modules/jsc-android/dist"
43
+    }
44
+    google()
45
+    jcenter()
17 46
 }
18 47
 
19 48
 dependencies {
20
-  // noinspection GradleDynamicVersion
21
-  api 'com.facebook.react:react-native:+'
49
+    //noinspection GradleDynamicVersion
50
+    implementation 'com.facebook.react:react-native:+' // From node_modules
22 51
 }

+ 12
- 9
package.json View File

@@ -64,17 +64,20 @@
64 64
     "react-native": ">=0.60.0"
65 65
   },
66 66
   "devDependencies": {
67
+    "@babel/core": "7.6.0",
67 68
     "@react-native-community/bob": "0.7.0",
68 69
     "@react-native-community/eslint-config": "0.0.5",
69
-    "@types/react-native": "0.60.7",
70
-    "@typescript-eslint/eslint-plugin": "2.0.0",
71
-    "@typescript-eslint/parser": "2.0.0",
72
-    "eslint": "6.2.1",
73
-    "eslint-config-prettier": "6.1.0",
74
-    "eslint-plugin-prettier": "3.1.0",
75
-    "husky": "3.0.4",
76
-    "lint-staged": "9.2.3",
70
+    "@types/react-native": "0.60.15",
71
+    "@typescript-eslint/eslint-plugin": "2.3.0",
72
+    "@typescript-eslint/parser": "2.3.0",
73
+    "eslint": "6.4.0",
74
+    "eslint-config-prettier": "6.3.0",
75
+    "eslint-plugin-prettier": "3.1.1",
76
+    "husky": "3.0.5",
77
+    "lint-staged": "9.2.5",
77 78
     "prettier": "1.18.2",
78
-    "typescript": "3.5.3"
79
+    "react": "16.8.6",
80
+    "react-native": "0.60.5",
81
+    "typescript": "3.6.3"
79 82
   }
80 83
 }

+ 3255
- 102
yarn.lock
File diff suppressed because it is too large
View File