From e863e1ccb163a5c787de01cf80e206e48491c0ca Mon Sep 17 00:00:00 2001 From: Edgar Asatryan Date: Sun, 8 Jan 2023 17:17:19 +0400 Subject: [PATCH] Revert "Use composite builds." This reverts commit d459a70e --- build-logic/basics/build.gradle.kts | 26 -------------- build-logic/benchmark/build.gradle.kts | 25 -------------- build-logic/build.gradle.kts | 25 -------------- build-logic/publishing/build.gradle.kts | 34 ------------------- build-logic/settings.gradle.kts | 29 ---------------- buildSrc/build.gradle.kts | 14 ++++++++ ....http.ext.benchmark-conventions.gradle.kts | 0 ...io.http.ext.library-conventions.gradle.kts | 0 ...io.http.ext.publish-conventions.gradle.kts | 0 ...io.http.ext.quality-conventions.gradle.kts | 0 ...stdio.http.ext.test-conventions.gradle.kts | 0 settings.gradle.kts | 2 -- 12 files changed, 14 insertions(+), 141 deletions(-) delete mode 100644 build-logic/basics/build.gradle.kts delete mode 100644 build-logic/benchmark/build.gradle.kts delete mode 100644 build-logic/build.gradle.kts delete mode 100644 build-logic/publishing/build.gradle.kts delete mode 100644 build-logic/settings.gradle.kts rename {build-logic/benchmark => buildSrc}/src/main/kotlin/io.github.nstdio.http.ext.benchmark-conventions.gradle.kts (100%) rename {build-logic/basics => buildSrc}/src/main/kotlin/io.github.nstdio.http.ext.library-conventions.gradle.kts (100%) rename {build-logic/publishing => buildSrc}/src/main/kotlin/io.github.nstdio.http.ext.publish-conventions.gradle.kts (100%) rename {build-logic/basics => buildSrc}/src/main/kotlin/io.github.nstdio.http.ext.quality-conventions.gradle.kts (100%) rename {build-logic/basics => buildSrc}/src/main/kotlin/io.github.nstdio.http.ext.test-conventions.gradle.kts (100%) diff --git a/build-logic/basics/build.gradle.kts b/build-logic/basics/build.gradle.kts deleted file mode 100644 index ec37cb5..0000000 --- a/build-logic/basics/build.gradle.kts +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright (C) 2022 Edgar Asatryan - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -plugins { - `java-library` - `kotlin-dsl` -} - -dependencies { - implementation("org.gradlex:extra-java-module-info:1.1") - implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.0") - implementation("com.github.spotbugs.snom:spotbugs-gradle-plugin:5.0.13") - implementation("com.github.dpaukov:combinatoricslib3:3.3.3") -} \ No newline at end of file diff --git a/build-logic/benchmark/build.gradle.kts b/build-logic/benchmark/build.gradle.kts deleted file mode 100644 index f727295..0000000 --- a/build-logic/benchmark/build.gradle.kts +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright (C) 2022 Edgar Asatryan - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -plugins { - `java-library` - `kotlin-dsl` -} - -dependencies { - implementation("me.champeau.jmh:jmh-gradle-plugin:0.6.8") - implementation("io.github.reyerizo.gradle:jcstress-gradle-plugin:0.8.14") -} diff --git a/build-logic/build.gradle.kts b/build-logic/build.gradle.kts deleted file mode 100644 index 2129f36..0000000 --- a/build-logic/build.gradle.kts +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright (C) 2022 Edgar Asatryan - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -description = "Provides plugins that are used by subprojects" - -subprojects { - repositories { - gradlePluginPortal() - - mavenCentral() - } -} \ No newline at end of file diff --git a/build-logic/publishing/build.gradle.kts b/build-logic/publishing/build.gradle.kts deleted file mode 100644 index 715ec19..0000000 --- a/build-logic/publishing/build.gradle.kts +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright (C) 2022 Edgar Asatryan - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -plugins { - `java-library` - `kotlin-dsl` -} - -description = "Provides plugins that are used by Gradle subprojects" - -dependencies { - implementation("io.github.gradle-nexus:publish-plugin:1.1.0") - implementation("net.researchgate:gradle-release:3.0.2") - implementation("net.researchgate:gradle-release:3.0.2") - implementation("se.bjurr.gitchangelog:git-changelog-gradle-plugin:1.77.2") { - isTransitive = false - } - implementation("se.bjurr.gitchangelog:git-changelog-lib:1.168.7") { - exclude("org.gitlab", "java-gitlab-api") - exclude("org.ow2.asm", "asm") - } -} \ No newline at end of file diff --git a/build-logic/settings.gradle.kts b/build-logic/settings.gradle.kts deleted file mode 100644 index 881bba3..0000000 --- a/build-logic/settings.gradle.kts +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright (C) 2022 Edgar Asatryan - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -pluginManagement { - repositories { - gradlePluginPortal() - - mavenCentral() - } -} - -rootProject.name = "build-logic" - -include("basics") -include("benchmark") -include("publishing") \ No newline at end of file diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 6906764..a436b95 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -23,5 +23,19 @@ repositories { } dependencies { + implementation("org.gradlex:extra-java-module-info:1.1") + implementation("io.github.gradle-nexus:publish-plugin:1.1.0") implementation("net.researchgate:gradle-release:3.0.2") + implementation("com.github.dpaukov:combinatoricslib3:3.3.3") + implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.0-RC2") + implementation("me.champeau.jmh:jmh-gradle-plugin:0.6.8") + implementation("se.bjurr.gitchangelog:git-changelog-gradle-plugin:1.77.0") { + isTransitive = false + } + implementation("se.bjurr.gitchangelog:git-changelog-lib:1.168.6") { + exclude("org.gitlab", "java-gitlab-api") + exclude("org.ow2.asm", "asm") + } + implementation("com.github.spotbugs.snom:spotbugs-gradle-plugin:5.0.13") + implementation("io.github.reyerizo.gradle:jcstress-gradle-plugin:0.8.14") } diff --git a/build-logic/benchmark/src/main/kotlin/io.github.nstdio.http.ext.benchmark-conventions.gradle.kts b/buildSrc/src/main/kotlin/io.github.nstdio.http.ext.benchmark-conventions.gradle.kts similarity index 100% rename from build-logic/benchmark/src/main/kotlin/io.github.nstdio.http.ext.benchmark-conventions.gradle.kts rename to buildSrc/src/main/kotlin/io.github.nstdio.http.ext.benchmark-conventions.gradle.kts diff --git a/build-logic/basics/src/main/kotlin/io.github.nstdio.http.ext.library-conventions.gradle.kts b/buildSrc/src/main/kotlin/io.github.nstdio.http.ext.library-conventions.gradle.kts similarity index 100% rename from build-logic/basics/src/main/kotlin/io.github.nstdio.http.ext.library-conventions.gradle.kts rename to buildSrc/src/main/kotlin/io.github.nstdio.http.ext.library-conventions.gradle.kts diff --git a/build-logic/publishing/src/main/kotlin/io.github.nstdio.http.ext.publish-conventions.gradle.kts b/buildSrc/src/main/kotlin/io.github.nstdio.http.ext.publish-conventions.gradle.kts similarity index 100% rename from build-logic/publishing/src/main/kotlin/io.github.nstdio.http.ext.publish-conventions.gradle.kts rename to buildSrc/src/main/kotlin/io.github.nstdio.http.ext.publish-conventions.gradle.kts diff --git a/build-logic/basics/src/main/kotlin/io.github.nstdio.http.ext.quality-conventions.gradle.kts b/buildSrc/src/main/kotlin/io.github.nstdio.http.ext.quality-conventions.gradle.kts similarity index 100% rename from build-logic/basics/src/main/kotlin/io.github.nstdio.http.ext.quality-conventions.gradle.kts rename to buildSrc/src/main/kotlin/io.github.nstdio.http.ext.quality-conventions.gradle.kts diff --git a/build-logic/basics/src/main/kotlin/io.github.nstdio.http.ext.test-conventions.gradle.kts b/buildSrc/src/main/kotlin/io.github.nstdio.http.ext.test-conventions.gradle.kts similarity index 100% rename from build-logic/basics/src/main/kotlin/io.github.nstdio.http.ext.test-conventions.gradle.kts rename to buildSrc/src/main/kotlin/io.github.nstdio.http.ext.test-conventions.gradle.kts diff --git a/settings.gradle.kts b/settings.gradle.kts index e8aab70..a3ca724 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,3 +1 @@ rootProject.name = "http-client-ext" - -includeBuild("build-logic")