From dbd8e915d55071633500aa7a7d8a2576bc4d113c Mon Sep 17 00:00:00 2001
From: Nicola Corti <ncor@meta.com>
Date: Tue, 11 Jul 2023 04:30:02 -0700
Subject: [PATCH] Remove the build-logic module

Summary:
As now we have a single module to publish, I'm removing the build-logic folder and moving everything inside the java/build.gradle file.
I've also converted it to Kotlin,

Reviewed By: NickGerleman

Differential Revision: D47259204

fbshipit-source-id: 2378d9e9598d7816f230db5f763f2b0f4cdf01d0
---
 build-logic/build.gradle.kts                  | 13 ----
 build.gradle                                  | 10 ---
 java/build.gradle                             | 63 -------------------
 .../build.gradle.kts                          | 59 +++++++++++++++--
 settings.gradle.kts                           |  2 -
 5 files changed, 55 insertions(+), 92 deletions(-)
 delete mode 100644 build-logic/build.gradle.kts
 delete mode 100644 java/build.gradle
 rename build-logic/src/main/kotlin/publish.gradle.kts => java/build.gradle.kts (59%)

diff --git a/build-logic/build.gradle.kts b/build-logic/build.gradle.kts
deleted file mode 100644
index 451a20b6..00000000
--- a/build-logic/build.gradle.kts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-plugins { `kotlin-dsl` }
-
-repositories {
-  mavenCentral()
-  gradlePluginPortal()
-}
diff --git a/build.gradle b/build.gradle
index 29fb537f..f2787996 100644
--- a/build.gradle
+++ b/build.gradle
@@ -38,16 +38,6 @@ nexusPublishing {
     }
 }
 
-ext {
-    buildToolsVersion = "33.0.0"
-    ndkVersion = "23.1.7779620"
-    minSdkVersion = 21
-    compileSdkVersion = 33
-    targetSdkVersion = 33
-    sourceCompatibilityVersion = JavaVersion.VERSION_1_8
-    targetCompatibilityVersion = JavaVersion.VERSION_1_8
-}
-
 task clean(type: Delete) {
     delete rootProject.buildDir
 }
diff --git a/java/build.gradle b/java/build.gradle
deleted file mode 100644
index bfabbdbd..00000000
--- a/java/build.gradle
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-plugins {
-    id("com.android.library")
-    id("publish")
-}
-
-android {
-    namespace 'com.facebook.yoga'
-
-    compileSdkVersion rootProject.compileSdkVersion
-    buildToolsVersion rootProject.buildToolsVersion
-    ndkVersion rootProject.ndkVersion
-
-    defaultConfig {
-        minSdkVersion rootProject.minSdkVersion
-        targetSdkVersion rootProject.targetSdkVersion
-
-        consumerProguardFiles 'proguard-rules.pro'
-
-        ndk {
-            abiFilters 'x86', 'x86_64', 'armeabi-v7a', 'arm64-v8a'
-        }
-    }
-
-    externalNativeBuild {
-        cmake {
-            path 'CMakeLists.txt'
-        }
-    }
-
-    compileOptions {
-        targetCompatibility rootProject.targetCompatibilityVersion
-        sourceCompatibility rootProject.sourceCompatibilityVersion
-    }
-
-    sourceSets {
-        main {
-            java.srcDir 'com'
-            manifest.srcFile 'AndroidManifest.xml'
-            res.srcDirs = ['res']
-        }
-    }
-
-    publishing {
-        multipleVariants {
-            withSourcesJar()
-            withJavadocJar()
-            includeBuildTypeValues('debug', 'release')
-        }
-    }
-}
-
-dependencies {
-    implementation 'com.google.code.findbugs:jsr305:3.0.2'
-    implementation 'com.facebook.soloader:soloader:0.10.4'
-    testImplementation 'junit:junit:4.12'
-}
diff --git a/build-logic/src/main/kotlin/publish.gradle.kts b/java/build.gradle.kts
similarity index 59%
rename from build-logic/src/main/kotlin/publish.gradle.kts
rename to java/build.gradle.kts
index 3cf621aa..5e2ee5d2 100644
--- a/build-logic/src/main/kotlin/publish.gradle.kts
+++ b/java/build.gradle.kts
@@ -6,18 +6,69 @@
  */
 
 plugins {
+  id("com.android.library")
   id("maven-publish")
   id("signing")
 }
 
 group = "com.facebook.yoga"
 
-if ("USE_SNAPSHOT".byProperty.toBoolean()) {
-  version = "${"VERSION_NAME".byProperty}-SNAPSHOT"
-} else {
-  version = "VERSION_NAME".byProperty.toString()
+val compileSdkVersionProperty: Int by rootProject.extra
+val minSdkVersionProperty: Int by rootProject.extra
+val targetSdkVersionProperty: Int by rootProject.extra
+val buildToolsVersionProperty: String by rootProject.extra
+val ndkVersionProperty: String by rootProject.extra
+
+android {
+  namespace = "com.facebook.yoga"
+  compileSdk = 33
+  buildToolsVersion = "33.0.0"
+  ndkVersion = "23.1.7779620"
+
+  defaultConfig {
+    minSdk = 21
+    consumerProguardFiles("proguard-rules.pro")
+
+    ndk { abiFilters.addAll(setOf("x86", "x86_64", "armeabi-v7a", "arm64-v8a")) }
+  }
+
+  externalNativeBuild { cmake { path("CMakeLists.txt") } }
+
+  compileOptions {
+    targetCompatibility(JavaVersion.VERSION_1_8)
+    sourceCompatibility(JavaVersion.VERSION_1_8)
+  }
+
+  sourceSets {
+    named("main") {
+      java.srcDir("com")
+      manifest.srcFile("AndroidManifest.xml")
+      res.srcDir("res")
+    }
+  }
+
+  publishing {
+    multipleVariants {
+      withSourcesJar()
+      withJavadocJar()
+      includeBuildTypeValues("debug", "release")
+    }
+  }
 }
 
+dependencies {
+  implementation("com.google.code.findbugs:jsr305:3.0.2")
+  implementation("com.facebook.soloader:soloader:0.10.5")
+  testImplementation("junit:junit:4.12")
+}
+
+version =
+    if ("USE_SNAPSHOT".byProperty.toBoolean()) {
+      "${"VERSION_NAME".byProperty}-SNAPSHOT"
+    } else {
+      "VERSION_NAME".byProperty.toString()
+    }
+
 publishing {
   publications {
     register<MavenPublication>("default") {
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 13f8c85e..c6952ca2 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -17,8 +17,6 @@ plugins { id("com.gradle.enterprise").version("3.7.1") }
 
 include(":yoga")
 
-includeBuild("build-logic")
-
 project(":yoga").projectDir = file("java")
 
 rootProject.name = "yoga-github"