From 74e453554fda635a732f6c49fd86768cf32327bb Mon Sep 17 00:00:00 2001 From: Dulmandakh Date: Sat, 27 Apr 2019 18:37:38 +0800 Subject: [PATCH 1/3] cleanup gradle --- RNTester/android/app/build.gradle | 7 +++---- ReactAndroid/build.gradle | 2 +- build.gradle | 9 +-------- settings.gradle | 6 ++++-- 4 files changed, 9 insertions(+), 15 deletions(-) diff --git a/RNTester/android/app/build.gradle b/RNTester/android/app/build.gradle index f1d9c0b09b3c8b..fbc75553a069c1 100644 --- a/RNTester/android/app/build.gradle +++ b/RNTester/android/app/build.gradle @@ -4,10 +4,9 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. */ - -apply plugin: 'com.android.application' - -import com.android.build.OutputFile +plugins { + id("com.android.application") +} /** * The react.gradle file registers a task for each build variant (e.g. bundleDebugJsAndAssets diff --git a/ReactAndroid/build.gradle b/ReactAndroid/build.gradle index 74b1d50c998d85..ceb471bc6fcbdb 100644 --- a/ReactAndroid/build.gradle +++ b/ReactAndroid/build.gradle @@ -6,7 +6,7 @@ plugins { id("com.android.library") id("maven") - id("de.undercouch.download") + id("de.undercouch.download") version "3.4.3" } import de.undercouch.gradle.tasks.download.Download diff --git a/build.gradle b/build.gradle index 9198857c2b19ae..b0a66afe87b1de 100644 --- a/build.gradle +++ b/build.gradle @@ -11,7 +11,6 @@ buildscript { } dependencies { classpath("com.android.tools.build:gradle:3.3.2") - classpath("de.undercouch:gradle-download-task:3.4.3") // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files @@ -20,17 +19,11 @@ buildscript { allprojects { repositories { - mavenLocal() maven { url("$rootDir/node_modules/jsc-android/dist") } - + mavenLocal() google() jcenter() - - def androidSdk = System.getenv("ANDROID_SDK") - maven { - url("$androidSdk/extras/m2repository/") - } } } diff --git a/settings.gradle b/settings.gradle index 6b0d36b3f15388..0daab695b880b2 100644 --- a/settings.gradle +++ b/settings.gradle @@ -3,5 +3,7 @@ // This source code is licensed under the MIT license found in the // LICENSE file in the root directory of this source tree. -include(":ReactAndroid") -include(":RNTester:android:app") +include( + ":ReactAndroid", + ":RNTester:android:app" +) From 991b16327bcd3ae022f13be23e20cc3fac97431a Mon Sep 17 00:00:00 2001 From: Dulmandakh Date: Sat, 27 Apr 2019 19:00:13 +0800 Subject: [PATCH 2/3] rename build.gradle -> build.gradle.kts, settings.gradle -> settings.gradle.kts --- build.gradle => build.gradle.kts | 0 settings.gradle => settings.gradle.kts | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename build.gradle => build.gradle.kts (100%) rename settings.gradle => settings.gradle.kts (100%) diff --git a/build.gradle b/build.gradle.kts similarity index 100% rename from build.gradle rename to build.gradle.kts diff --git a/settings.gradle b/settings.gradle.kts similarity index 100% rename from settings.gradle rename to settings.gradle.kts From 866b6aae2556dc536beea2ad7c5251c0c2dd5e33 Mon Sep 17 00:00:00 2001 From: Dulmandakh Date: Sat, 27 Apr 2019 19:00:29 +0800 Subject: [PATCH 3/3] fix build.gradle.kts --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index b0a66afe87b1de..7b1aba67a41552 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -20,7 +20,7 @@ buildscript { allprojects { repositories { maven { - url("$rootDir/node_modules/jsc-android/dist") + url = uri("$rootDir/node_modules/jsc-android/dist") } mavenLocal() google()