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
This commit is contained in:
committed by
Facebook GitHub Bot
parent
f7324fb71e
commit
dbd8e915d5
@@ -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()
|
|
||||||
}
|
|
10
build.gradle
10
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) {
|
task clean(type: Delete) {
|
||||||
delete rootProject.buildDir
|
delete rootProject.buildDir
|
||||||
}
|
}
|
||||||
|
@@ -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'
|
|
||||||
}
|
|
@@ -6,18 +6,69 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
plugins {
|
plugins {
|
||||||
|
id("com.android.library")
|
||||||
id("maven-publish")
|
id("maven-publish")
|
||||||
id("signing")
|
id("signing")
|
||||||
}
|
}
|
||||||
|
|
||||||
group = "com.facebook.yoga"
|
group = "com.facebook.yoga"
|
||||||
|
|
||||||
if ("USE_SNAPSHOT".byProperty.toBoolean()) {
|
val compileSdkVersionProperty: Int by rootProject.extra
|
||||||
version = "${"VERSION_NAME".byProperty}-SNAPSHOT"
|
val minSdkVersionProperty: Int by rootProject.extra
|
||||||
} else {
|
val targetSdkVersionProperty: Int by rootProject.extra
|
||||||
version = "VERSION_NAME".byProperty.toString()
|
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 {
|
publishing {
|
||||||
publications {
|
publications {
|
||||||
register<MavenPublication>("default") {
|
register<MavenPublication>("default") {
|
@@ -17,8 +17,6 @@ plugins { id("com.gradle.enterprise").version("3.7.1") }
|
|||||||
|
|
||||||
include(":yoga")
|
include(":yoga")
|
||||||
|
|
||||||
includeBuild("build-logic")
|
|
||||||
|
|
||||||
project(":yoga").projectDir = file("java")
|
project(":yoga").projectDir = file("java")
|
||||||
|
|
||||||
rootProject.name = "yoga-github"
|
rootProject.name = "yoga-github"
|
||||||
|
Reference in New Issue
Block a user