From a0e6ffebbf8e3a44e1d6064e2340a42867cb2f47 Mon Sep 17 00:00:00 2001 From: Nicola Corti Date: Thu, 9 Jun 2022 02:50:45 -0700 Subject: [PATCH] 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 --- build.gradle.kts | 100 ++++++++---------- .../build.gradle.kts | 32 +++--- .../settings.gradle.kts | 10 +- settings.gradle.kts | 19 ++-- 4 files changed, 76 insertions(+), 85 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 66aa441f0c01da..eadfc78f58ee9b 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -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") } diff --git a/packages/react-native-gradle-plugin/build.gradle.kts b/packages/react-native-gradle-plugin/build.gradle.kts index 9d84e2e95fb9cb..e02b0c8babf8ed 100644 --- a/packages/react-native-gradle-plugin/build.gradle.kts +++ b/packages/react-native-gradle-plugin/build.gradle.kts @@ -40,28 +40,28 @@ dependencies { testImplementation("junit:junit:4.13.2") testRuntimeOnly( - files( - serviceOf().getModule("gradle-tooling-api-builders").classpath.asFiles.first() - ) - ) + files( + serviceOf() + .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 { - kotlinOptions { - jvmTarget = JavaVersion.VERSION_11.majorVersion - } + kotlinOptions { jvmTarget = JavaVersion.VERSION_11.majorVersion } } tasks.withType().configureEach { - testLogging { - exceptionFormat = TestExceptionFormat.FULL - showExceptions = true - showCauses = true - showStackTraces = true - } -} \ No newline at end of file + testLogging { + exceptionFormat = TestExceptionFormat.FULL + showExceptions = true + showCauses = true + showStackTraces = true + } +} diff --git a/packages/react-native-gradle-plugin/settings.gradle.kts b/packages/react-native-gradle-plugin/settings.gradle.kts index c50bb5808dcc7a..8daf82d475afec 100644 --- a/packages/react-native-gradle-plugin/settings.gradle.kts +++ b/packages/react-native-gradle-plugin/settings.gradle.kts @@ -6,11 +6,11 @@ */ pluginManagement { - repositories { - mavenCentral() - google() - gradlePluginPortal() - } + repositories { + mavenCentral() + google() + gradlePluginPortal() + } } rootProject.name = "react-native-gradle-plugin" diff --git a/settings.gradle.kts b/settings.gradle.kts index 2e7297ebc14918..018994f05a08be 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -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") }