Skip to content

Gradle KTS #24631

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 4 commits into from
Closed

Gradle KTS #24631

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
74e4535
cleanup gradle
dulmandakh Apr 27, 2019
991b163
rename build.gradle -> build.gradle.kts, settings.gradle -> settings.…
dulmandakh Apr 27, 2019
866b6aa
fix build.gradle.kts
dulmandakh Apr 27, 2019
857ee30
merge master
dulmandakh Apr 28, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions RNTester/android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ReactAndroid/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
11 changes: 2 additions & 9 deletions build.gradle → build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ buildscript {
}
dependencies {
classpath("com.android.tools.build:gradle:3.4.0")
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
Expand All @@ -20,17 +19,11 @@ buildscript {

allprojects {
repositories {
mavenLocal()
maven {
url("$rootDir/node_modules/jsc-android/dist")
url = uri("$rootDir/node_modules/jsc-android/dist")
}

mavenLocal()
google()
jcenter()

def androidSdk = System.getenv("ANDROID_SDK")
maven {
url("$androidSdk/extras/m2repository/")
}
}
}
6 changes: 4 additions & 2 deletions settings.gradle → settings.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)