Skip to content

Commit a0e6ffe

Browse files
cortinicofacebook-github-bot
cortinico
authored and
facebook-github-bot
committed
Format .kts files with ktfmt
Summary: I'm extending ktfmt setup to run on kotlin script files as well. Changelog: [Internal] [Changed] - Reformat .kts files with ktfmt skip-linter-coverage-verification Reviewed By: zertosh Differential Revision: D36967010 fbshipit-source-id: a83f3facbb5f30b935b69fc70a5588e4da5996b2
1 parent 4e4b9e2 commit a0e6ffe

File tree

4 files changed

+76
-85
lines changed

4 files changed

+76
-85
lines changed

‎build.gradle.kts

Lines changed: 47 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -9,70 +9,64 @@ val ndkPath by extra(System.getenv("ANDROID_NDK"))
99
val ndkVersion by extra(System.getenv("ANDROID_NDK_VERSION"))
1010

1111
buildscript {
12-
repositories {
13-
google()
14-
mavenCentral()
15-
}
16-
dependencies {
17-
classpath("com.android.tools.build:gradle:7.2.0")
18-
classpath("de.undercouch:gradle-download-task:5.0.1")
19-
// NOTE: Do not place your application dependencies here; they belong
20-
// in the individual module build.gradle files
21-
}
12+
repositories {
13+
google()
14+
mavenCentral()
15+
}
16+
dependencies {
17+
classpath("com.android.tools.build:gradle:7.2.0")
18+
classpath("de.undercouch:gradle-download-task:5.0.1")
19+
// NOTE: Do not place your application dependencies here; they belong
20+
// in the individual module build.gradle files
21+
}
2222
}
2323

2424
allprojects {
25-
repositories {
26-
maven {
27-
url = uri("$rootDir/node_modules/jsc-android/dist")
28-
}
29-
maven {
30-
url = uri("$rootDir/android")
31-
}
32-
google()
33-
mavenCentral {
34-
// We don't want to fetch react-native from Maven Central as there are
35-
// older versions over there.
36-
content {
37-
excludeGroup("com.facebook.react")
38-
}
39-
}
25+
repositories {
26+
maven { url = uri("$rootDir/node_modules/jsc-android/dist") }
27+
maven { url = uri("$rootDir/android") }
28+
google()
29+
mavenCentral {
30+
// We don't want to fetch react-native from Maven Central as there are
31+
// older versions over there.
32+
content { excludeGroup("com.facebook.react") }
4033
}
34+
}
4135
}
4236

4337
tasks.register("cleanAll", Delete::class.java) {
44-
description = "Remove all the build files and intermediate build outputs"
45-
dependsOn(gradle.includedBuild("react-native-gradle-plugin").task(":clean"))
46-
delete(allprojects.map { it.buildDir })
47-
delete(rootProject.file("./ReactAndroid/.cxx"))
48-
delete(rootProject.file("./ReactAndroid/hermes-engine/.cxx"))
49-
delete(rootProject.file("./sdks/download/"))
50-
delete(rootProject.file("./sdks/hermes/"))
51-
delete(rootProject.file("./ReactAndroid/src/main/jni/prebuilt/lib/arm64-v8a/"))
52-
delete(rootProject.file("./ReactAndroid/src/main/jni/prebuilt/lib/armeabi-v7a/"))
53-
delete(rootProject.file("./ReactAndroid/src/main/jni/prebuilt/lib/x86/"))
54-
delete(rootProject.file("./ReactAndroid/src/main/jni/prebuilt/lib/x86_64/"))
55-
delete(rootProject.file("./packages/react-native-codegen/lib"))
56-
delete(rootProject.file("./packages/rn-tester/android/app/.cxx"))
38+
description = "Remove all the build files and intermediate build outputs"
39+
dependsOn(gradle.includedBuild("react-native-gradle-plugin").task(":clean"))
40+
delete(allprojects.map { it.buildDir })
41+
delete(rootProject.file("./ReactAndroid/.cxx"))
42+
delete(rootProject.file("./ReactAndroid/hermes-engine/.cxx"))
43+
delete(rootProject.file("./sdks/download/"))
44+
delete(rootProject.file("./sdks/hermes/"))
45+
delete(rootProject.file("./ReactAndroid/src/main/jni/prebuilt/lib/arm64-v8a/"))
46+
delete(rootProject.file("./ReactAndroid/src/main/jni/prebuilt/lib/armeabi-v7a/"))
47+
delete(rootProject.file("./ReactAndroid/src/main/jni/prebuilt/lib/x86/"))
48+
delete(rootProject.file("./ReactAndroid/src/main/jni/prebuilt/lib/x86_64/"))
49+
delete(rootProject.file("./packages/react-native-codegen/lib"))
50+
delete(rootProject.file("./packages/rn-tester/android/app/.cxx"))
5751
}
5852

5953
tasks.register("buildAll") {
60-
description = "Build and test all the React Native relevant projects."
61-
dependsOn(gradle.includedBuild("react-native-gradle-plugin").task(":build"))
62-
// This builds both the React Native framework for both debug and release
63-
dependsOn(":ReactAndroid:assemble")
64-
// This creates all the Maven artifacts and makes them available in the /android folder
65-
dependsOn(":ReactAndroid:installArchives")
66-
// This builds RN Tester for Hermes/JSC for debug only
67-
dependsOn(":packages:rn-tester:android:app:assembleDebug")
54+
description = "Build and test all the React Native relevant projects."
55+
dependsOn(gradle.includedBuild("react-native-gradle-plugin").task(":build"))
56+
// This builds both the React Native framework for both debug and release
57+
dependsOn(":ReactAndroid:assemble")
58+
// This creates all the Maven artifacts and makes them available in the /android folder
59+
dependsOn(":ReactAndroid:installArchives")
60+
// This builds RN Tester for Hermes/JSC for debug only
61+
dependsOn(":packages:rn-tester:android:app:assembleDebug")
6862
}
6963

7064
tasks.register("downloadAll") {
71-
description = "Download all the depedencies needed locally so they can be cached on CI."
72-
dependsOn(gradle.includedBuild("react-native-gradle-plugin").task(":dependencies"))
73-
dependsOn(":ReactAndroid:downloadNdkBuildDependencies")
74-
dependsOn(":ReactAndroid:dependencies")
75-
dependsOn(":ReactAndroid:androidDependencies")
76-
dependsOn(":ReactAndroid:hermes-engine:dependencies")
77-
dependsOn(":ReactAndroid:hermes-engine:androidDependencies")
65+
description = "Download all the depedencies needed locally so they can be cached on CI."
66+
dependsOn(gradle.includedBuild("react-native-gradle-plugin").task(":dependencies"))
67+
dependsOn(":ReactAndroid:downloadNdkBuildDependencies")
68+
dependsOn(":ReactAndroid:dependencies")
69+
dependsOn(":ReactAndroid:androidDependencies")
70+
dependsOn(":ReactAndroid:hermes-engine:dependencies")
71+
dependsOn(":ReactAndroid:hermes-engine:androidDependencies")
7872
}

‎packages/react-native-gradle-plugin/build.gradle.kts

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -40,28 +40,28 @@ dependencies {
4040
testImplementation("junit:junit:4.13.2")
4141

4242
testRuntimeOnly(
43-
files(
44-
serviceOf<ModuleRegistry>().getModule("gradle-tooling-api-builders").classpath.asFiles.first()
45-
)
46-
)
43+
files(
44+
serviceOf<ModuleRegistry>()
45+
.getModule("gradle-tooling-api-builders")
46+
.classpath
47+
.asFiles
48+
.first()))
4749
}
4850

4951
java {
50-
sourceCompatibility = JavaVersion.VERSION_1_8
51-
targetCompatibility = JavaVersion.VERSION_1_8
52+
sourceCompatibility = JavaVersion.VERSION_1_8
53+
targetCompatibility = JavaVersion.VERSION_1_8
5254
}
5355

5456
tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
55-
kotlinOptions {
56-
jvmTarget = JavaVersion.VERSION_11.majorVersion
57-
}
57+
kotlinOptions { jvmTarget = JavaVersion.VERSION_11.majorVersion }
5858
}
5959

6060
tasks.withType<Test>().configureEach {
61-
testLogging {
62-
exceptionFormat = TestExceptionFormat.FULL
63-
showExceptions = true
64-
showCauses = true
65-
showStackTraces = true
66-
}
67-
}
61+
testLogging {
62+
exceptionFormat = TestExceptionFormat.FULL
63+
showExceptions = true
64+
showCauses = true
65+
showStackTraces = true
66+
}
67+
}

‎packages/react-native-gradle-plugin/settings.gradle.kts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
*/
77

88
pluginManagement {
9-
repositories {
10-
mavenCentral()
11-
google()
12-
gradlePluginPortal()
13-
}
9+
repositories {
10+
mavenCentral()
11+
google()
12+
gradlePluginPortal()
13+
}
1414
}
1515

1616
rootProject.name = "react-native-gradle-plugin"

‎settings.gradle.kts

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,31 +6,28 @@
66
*/
77

88
pluginManagement {
9-
repositories {
10-
mavenCentral()
11-
google()
12-
gradlePluginPortal()
13-
}
9+
repositories {
10+
mavenCentral()
11+
google()
12+
gradlePluginPortal()
13+
}
1414
}
1515

1616
include(
1717
":ReactAndroid",
1818
":ReactAndroid:hermes-engine",
1919
":packages:react-native-codegen:android",
20-
":packages:rn-tester:android:app"
21-
)
20+
":packages:rn-tester:android:app")
2221

2322
// Include this to enable codegen Gradle plugin.
2423
includeBuild("packages/react-native-gradle-plugin/")
2524

2625
rootProject.name = "react-native-github"
2726

28-
plugins {
29-
id("com.gradle.enterprise").version("3.7.1")
30-
}
27+
plugins { id("com.gradle.enterprise").version("3.7.1") }
3128

3229
// If you specify a file inside gradle/gradle-enterprise.gradle.kts
3330
// you can configure your custom Gradle Enterprise instance
3431
if (File("./gradle/gradle-enterprise.gradle.kts").exists()) {
35-
apply(from = "./gradle/gradle-enterprise.gradle.kts")
32+
apply(from = "./gradle/gradle-enterprise.gradle.kts")
3633
}

0 commit comments

Comments
 (0)