Skip to content

Commit

Permalink
Format .kts files with ktfmt
Browse files Browse the repository at this point in the history
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
  • Loading branch information
cortinico authored and facebook-github-bot committed Jun 9, 2022
1 parent 4e4b9e2 commit a0e6ffe
Show file tree
Hide file tree
Showing 4 changed files with 76 additions and 85 deletions.
100 changes: 47 additions & 53 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -9,70 +9,64 @@ val ndkPath by extra(System.getenv("ANDROID_NDK"))
val ndkVersion by extra(System.getenv("ANDROID_NDK_VERSION"))

buildscript {
repositories {
google()
mavenCentral()
}
dependencies {
classpath("com.android.tools.build:gradle:7.2.0")
classpath("de.undercouch:gradle-download-task:5.0.1")
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
}
repositories {
google()
mavenCentral()
}
dependencies {
classpath("com.android.tools.build:gradle:7.2.0")
classpath("de.undercouch:gradle-download-task:5.0.1")
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
}
}

allprojects {
repositories {
maven {
url = uri("$rootDir/node_modules/jsc-android/dist")
}
maven {
url = uri("$rootDir/android")
}
google()
mavenCentral {
// We don't want to fetch react-native from Maven Central as there are
// older versions over there.
content {
excludeGroup("com.facebook.react")
}
}
repositories {
maven { url = uri("$rootDir/node_modules/jsc-android/dist") }
maven { url = uri("$rootDir/android") }
google()
mavenCentral {
// We don't want to fetch react-native from Maven Central as there are
// older versions over there.
content { excludeGroup("com.facebook.react") }
}
}
}

tasks.register("cleanAll", Delete::class.java) {
description = "Remove all the build files and intermediate build outputs"
dependsOn(gradle.includedBuild("react-native-gradle-plugin").task(":clean"))
delete(allprojects.map { it.buildDir })
delete(rootProject.file("./ReactAndroid/.cxx"))
delete(rootProject.file("./ReactAndroid/hermes-engine/.cxx"))
delete(rootProject.file("./sdks/download/"))
delete(rootProject.file("./sdks/hermes/"))
delete(rootProject.file("./ReactAndroid/src/main/jni/prebuilt/lib/arm64-v8a/"))
delete(rootProject.file("./ReactAndroid/src/main/jni/prebuilt/lib/armeabi-v7a/"))
delete(rootProject.file("./ReactAndroid/src/main/jni/prebuilt/lib/x86/"))
delete(rootProject.file("./ReactAndroid/src/main/jni/prebuilt/lib/x86_64/"))
delete(rootProject.file("./packages/react-native-codegen/lib"))
delete(rootProject.file("./packages/rn-tester/android/app/.cxx"))
description = "Remove all the build files and intermediate build outputs"
dependsOn(gradle.includedBuild("react-native-gradle-plugin").task(":clean"))
delete(allprojects.map { it.buildDir })
delete(rootProject.file("./ReactAndroid/.cxx"))
delete(rootProject.file("./ReactAndroid/hermes-engine/.cxx"))
delete(rootProject.file("./sdks/download/"))
delete(rootProject.file("./sdks/hermes/"))
delete(rootProject.file("./ReactAndroid/src/main/jni/prebuilt/lib/arm64-v8a/"))
delete(rootProject.file("./ReactAndroid/src/main/jni/prebuilt/lib/armeabi-v7a/"))
delete(rootProject.file("./ReactAndroid/src/main/jni/prebuilt/lib/x86/"))
delete(rootProject.file("./ReactAndroid/src/main/jni/prebuilt/lib/x86_64/"))
delete(rootProject.file("./packages/react-native-codegen/lib"))
delete(rootProject.file("./packages/rn-tester/android/app/.cxx"))
}

tasks.register("buildAll") {
description = "Build and test all the React Native relevant projects."
dependsOn(gradle.includedBuild("react-native-gradle-plugin").task(":build"))
// This builds both the React Native framework for both debug and release
dependsOn(":ReactAndroid:assemble")
// This creates all the Maven artifacts and makes them available in the /android folder
dependsOn(":ReactAndroid:installArchives")
// This builds RN Tester for Hermes/JSC for debug only
dependsOn(":packages:rn-tester:android:app:assembleDebug")
description = "Build and test all the React Native relevant projects."
dependsOn(gradle.includedBuild("react-native-gradle-plugin").task(":build"))
// This builds both the React Native framework for both debug and release
dependsOn(":ReactAndroid:assemble")
// This creates all the Maven artifacts and makes them available in the /android folder
dependsOn(":ReactAndroid:installArchives")
// This builds RN Tester for Hermes/JSC for debug only
dependsOn(":packages:rn-tester:android:app:assembleDebug")
}

tasks.register("downloadAll") {
description = "Download all the depedencies needed locally so they can be cached on CI."
dependsOn(gradle.includedBuild("react-native-gradle-plugin").task(":dependencies"))
dependsOn(":ReactAndroid:downloadNdkBuildDependencies")
dependsOn(":ReactAndroid:dependencies")
dependsOn(":ReactAndroid:androidDependencies")
dependsOn(":ReactAndroid:hermes-engine:dependencies")
dependsOn(":ReactAndroid:hermes-engine:androidDependencies")
description = "Download all the depedencies needed locally so they can be cached on CI."
dependsOn(gradle.includedBuild("react-native-gradle-plugin").task(":dependencies"))
dependsOn(":ReactAndroid:downloadNdkBuildDependencies")
dependsOn(":ReactAndroid:dependencies")
dependsOn(":ReactAndroid:androidDependencies")
dependsOn(":ReactAndroid:hermes-engine:dependencies")
dependsOn(":ReactAndroid:hermes-engine:androidDependencies")
}
32 changes: 16 additions & 16 deletions packages/react-native-gradle-plugin/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -40,28 +40,28 @@ dependencies {
testImplementation("junit:junit:4.13.2")

testRuntimeOnly(
files(
serviceOf<ModuleRegistry>().getModule("gradle-tooling-api-builders").classpath.asFiles.first()
)
)
files(
serviceOf<ModuleRegistry>()
.getModule("gradle-tooling-api-builders")
.classpath
.asFiles
.first()))
}

java {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}

tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
kotlinOptions {
jvmTarget = JavaVersion.VERSION_11.majorVersion
}
kotlinOptions { jvmTarget = JavaVersion.VERSION_11.majorVersion }
}

tasks.withType<Test>().configureEach {
testLogging {
exceptionFormat = TestExceptionFormat.FULL
showExceptions = true
showCauses = true
showStackTraces = true
}
}
testLogging {
exceptionFormat = TestExceptionFormat.FULL
showExceptions = true
showCauses = true
showStackTraces = true
}
}
10 changes: 5 additions & 5 deletions packages/react-native-gradle-plugin/settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
*/

pluginManagement {
repositories {
mavenCentral()
google()
gradlePluginPortal()
}
repositories {
mavenCentral()
google()
gradlePluginPortal()
}
}

rootProject.name = "react-native-gradle-plugin"
19 changes: 8 additions & 11 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -6,31 +6,28 @@
*/

pluginManagement {
repositories {
mavenCentral()
google()
gradlePluginPortal()
}
repositories {
mavenCentral()
google()
gradlePluginPortal()
}
}

include(
":ReactAndroid",
":ReactAndroid:hermes-engine",
":packages:react-native-codegen:android",
":packages:rn-tester:android:app"
)
":packages:rn-tester:android:app")

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

rootProject.name = "react-native-github"

plugins {
id("com.gradle.enterprise").version("3.7.1")
}
plugins { id("com.gradle.enterprise").version("3.7.1") }

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

0 comments on commit a0e6ffe

Please sign in to comment.