Merge pull request #97 from martinbonnin/add-composite-build

Make the root project a composite build
Yelp · Feb 7, 2020 · cc71ca0 · cc71ca0
2 parents d689512 + 8fadb86
commit cc71ca0
Show file tree

Hide file tree

Showing 52 changed files with 31 additions and 22 deletions.
diff --git a/Makefile b/Makefile
@@ -6,20 +6,14 @@
 install-hooks: .git/hooks/pre-commit
 	@true
 
-regenerate-samples:
-	${CURDIR}/gradlew plugin:build
-	${CURDIR}/gradlew plugin:publishToMavenLocal
-	${CURDIR}/gradlew generateSwagger
-
 run-hooks: venv
 	${CURDIR}/venv/bin/pre-commit run --all-files
 
 test: run-hooks
-	${CURDIR}/gradlew plugin:build
-	${CURDIR}/gradlew plugin:publishToMavenLocal
+	${CURDIR}/gradlew --project-dir gradle-plugin build check
 	${CURDIR}/gradlew generateSwagger
-	${CURDIR}/gradlew assembleDebug
-	${CURDIR}/gradlew check
+	# The check task requires a lot of MetaSpace
+	${CURDIR}/gradlew assembleDebug check -Dorg.gradle.jvmargs="-Xmx4g -XX:MaxMetaspaceSize=2g"
 
 venv:
 	virtualenv venv

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,6 +1,3 @@
-group = PublishingVersions.PLUGIN_GROUP
-version = PublishingVersions.PLUGIN_VERSION
-
 subprojects {
     repositories {
         google()

diff --git a/gradle-plugin/build.gradle.kts b/gradle-plugin/build.gradle.kts
@@ -0,0 +1,10 @@
+group = PublishingVersions.PLUGIN_GROUP
+version = PublishingVersions.PLUGIN_VERSION
+
+subprojects {
+    repositories {
+        google()
+        mavenCentral()
+        jcenter()
+    }
+}
diff --git a/buildSrc/build.gradle.kts → gradle-plugin/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts → gradle-plugin/buildSrc/build.gradle.kts
diff --git a/...yelp/codegen/gradle/PublishingVersions.kt → ...yelp/codegen/gradle/PublishingVersions.kt b/...yelp/codegen/gradle/PublishingVersions.kt → ...yelp/codegen/gradle/PublishingVersions.kt
diff --git a/plugin/build.gradle.kts → gradle-plugin/plugin/build.gradle.kts b/plugin/build.gradle.kts → gradle-plugin/plugin/build.gradle.kts
@@ -69,7 +69,7 @@ configure<PublishingExtension> {
 detekt {
     toolVersion = "1.4.0"
     input = files("src/")
-    config = rootProject.files("./config/detekt/detekt.yml")
+    config = rootProject.files("../config/detekt/detekt.yml")
 }
 
 tasks.jacocoTestReport {

diff --git a/.../yelp/codegen/KotlinCoroutineGenerator.kt → .../yelp/codegen/KotlinCoroutineGenerator.kt b/.../yelp/codegen/KotlinCoroutineGenerator.kt → .../yelp/codegen/KotlinCoroutineGenerator.kt
diff --git a/.../java/com/yelp/codegen/KotlinGenerator.kt → .../java/com/yelp/codegen/KotlinGenerator.kt b/.../java/com/yelp/codegen/KotlinGenerator.kt → .../java/com/yelp/codegen/KotlinGenerator.kt
diff --git a/...in/src/main/java/com/yelp/codegen/Main.kt → ...in/src/main/java/com/yelp/codegen/Main.kt b/...in/src/main/java/com/yelp/codegen/Main.kt → ...in/src/main/java/com/yelp/codegen/Main.kt
diff --git a/...in/java/com/yelp/codegen/SharedCodegen.kt → ...in/java/com/yelp/codegen/SharedCodegen.kt b/...in/java/com/yelp/codegen/SharedCodegen.kt → ...in/java/com/yelp/codegen/SharedCodegen.kt
diff --git a/...lp/codegen/plugin/FeatureConfiguration.kt → ...lp/codegen/plugin/FeatureConfiguration.kt b/...lp/codegen/plugin/FeatureConfiguration.kt → ...lp/codegen/plugin/FeatureConfiguration.kt
diff --git a/...a/com/yelp/codegen/plugin/GenerateTask.kt → ...a/com/yelp/codegen/plugin/GenerateTask.kt b/...a/com/yelp/codegen/plugin/GenerateTask.kt → ...a/com/yelp/codegen/plugin/GenerateTask.kt
diff --git a/...degen/plugin/GenerateTaskConfiguration.kt → ...degen/plugin/GenerateTaskConfiguration.kt b/...degen/plugin/GenerateTaskConfiguration.kt → ...degen/plugin/GenerateTaskConfiguration.kt
diff --git a/...com/yelp/codegen/utils/KotlinLangUtils.kt → ...com/yelp/codegen/utils/KotlinLangUtils.kt b/...com/yelp/codegen/utils/KotlinLangUtils.kt → ...com/yelp/codegen/utils/KotlinLangUtils.kt
diff --git a/...ava/com/yelp/codegen/utils/StringUtils.kt → ...ava/com/yelp/codegen/utils/StringUtils.kt b/...ava/com/yelp/codegen/utils/StringUtils.kt → ...ava/com/yelp/codegen/utils/StringUtils.kt
diff --git a/...kotlin/com/yelp/codegen/plugin.gradle.kts → ...kotlin/com/yelp/codegen/plugin.gradle.kts b/...kotlin/com/yelp/codegen/plugin.gradle.kts → ...kotlin/com/yelp/codegen/plugin.gradle.kts
diff --git a/...services/io.swagger.codegen.CodegenConfig → ...services/io.swagger.codegen.CodegenConfig b/...services/io.swagger.codegen.CodegenConfig → ...services/io.swagger.codegen.CodegenConfig
diff --git a/...main/resources/kotlin/data_class.mustache → ...main/resources/kotlin/data_class.mustache b/...main/resources/kotlin/data_class.mustache → ...main/resources/kotlin/data_class.mustache
diff --git a/...ources/kotlin/data_class_opt_var.mustache → ...ources/kotlin/data_class_opt_var.mustache b/...ources/kotlin/data_class_opt_var.mustache → ...ources/kotlin/data_class_opt_var.mustache
diff --git a/...ources/kotlin/data_class_req_var.mustache → ...ources/kotlin/data_class_req_var.mustache b/...ources/kotlin/data_class_req_var.mustache → ...ources/kotlin/data_class_req_var.mustache
diff --git a/...main/resources/kotlin/enum_class.mustache → ...main/resources/kotlin/enum_class.mustache b/...main/resources/kotlin/enum_class.mustache → ...main/resources/kotlin/enum_class.mustache
diff --git a/...ain/resources/kotlin/file_header.mustache → ...ain/resources/kotlin/file_header.mustache b/...ain/resources/kotlin/file_header.mustache → ...ain/resources/kotlin/file_header.mustache
diff --git a/.../src/main/resources/kotlin/model.mustache → .../src/main/resources/kotlin/model.mustache b/.../src/main/resources/kotlin/model.mustache → .../src/main/resources/kotlin/model.mustache
diff --git a/...n/resources/kotlin/retrofit2/api.mustache → ...n/resources/kotlin/retrofit2/api.mustache b/...n/resources/kotlin/retrofit2/api.mustache → ...n/resources/kotlin/retrofit2/api.mustache
diff --git a/...rces/kotlin/retrofit2/bodyParams.mustache → ...rces/kotlin/retrofit2/bodyParams.mustache b/...rces/kotlin/retrofit2/bodyParams.mustache → ...rces/kotlin/retrofit2/bodyParams.mustache
diff --git a/...rces/kotlin/retrofit2/formParams.mustache → ...rces/kotlin/retrofit2/formParams.mustache b/...rces/kotlin/retrofit2/formParams.mustache → ...rces/kotlin/retrofit2/formParams.mustache
diff --git a/...es/kotlin/retrofit2/headerParams.mustache → ...es/kotlin/retrofit2/headerParams.mustache b/...es/kotlin/retrofit2/headerParams.mustache → ...es/kotlin/retrofit2/headerParams.mustache
diff --git a/...rces/kotlin/retrofit2/pathParams.mustache → ...rces/kotlin/retrofit2/pathParams.mustache b/...rces/kotlin/retrofit2/pathParams.mustache → ...rces/kotlin/retrofit2/pathParams.mustache
diff --git a/...ces/kotlin/retrofit2/queryParams.mustache → ...ces/kotlin/retrofit2/queryParams.mustache b/...ces/kotlin/retrofit2/queryParams.mustache → ...ces/kotlin/retrofit2/queryParams.mustache
diff --git a/...lectionFormatConverterFactory.kt.mustache → ...lectionFormatConverterFactory.kt.mustache b/...lectionFormatConverterFactory.kt.mustache → ...lectionFormatConverterFactory.kt.mustache
diff --git a/...otlin/tools/CollectionFormats.kt.mustache → ...otlin/tools/CollectionFormats.kt.mustache b/...otlin/tools/CollectionFormats.kt.mustache → ...otlin/tools/CollectionFormats.kt.mustache
diff --git a/...s/EnumToValueConverterFactory.kt.mustache → ...s/EnumToValueConverterFactory.kt.mustache b/...s/EnumToValueConverterFactory.kt.mustache → ...s/EnumToValueConverterFactory.kt.mustache
diff --git a/...tools/GeneratedCodeConverters.kt.mustache → ...tools/GeneratedCodeConverters.kt.mustache b/...tools/GeneratedCodeConverters.kt.mustache → ...tools/GeneratedCodeConverters.kt.mustache
diff --git a/...es/kotlin/tools/TypesAdapters.kt.mustache → ...es/kotlin/tools/TypesAdapters.kt.mustache b/...es/kotlin/tools/TypesAdapters.kt.mustache → ...es/kotlin/tools/TypesAdapters.kt.mustache
diff --git a/...tools/WrapperConverterFactory.kt.mustache → ...tools/WrapperConverterFactory.kt.mustache b/...tools/WrapperConverterFactory.kt.mustache → ...tools/WrapperConverterFactory.kt.mustache
diff --git a/...ources/kotlin/tools/XNullable.kt.mustache → ...ources/kotlin/tools/XNullable.kt.mustache b/...ources/kotlin/tools/XNullable.kt.mustache → ...ources/kotlin/tools/XNullable.kt.mustache
diff --git a/...tools/XNullableAdapterFactory.kt.mustache → ...tools/XNullableAdapterFactory.kt.mustache b/...tools/XNullableAdapterFactory.kt.mustache → ...tools/XNullableAdapterFactory.kt.mustache
diff --git a/...main/resources/kotlin/type_alias.mustache → ...main/resources/kotlin/type_alias.mustache b/...main/resources/kotlin/type_alias.mustache → ...main/resources/kotlin/type_alias.mustache
diff --git a/...a/com/yelp/codegen/KotlinGeneratorTest.kt → ...a/com/yelp/codegen/KotlinGeneratorTest.kt b/...a/com/yelp/codegen/KotlinGeneratorTest.kt → ...a/com/yelp/codegen/KotlinGeneratorTest.kt
diff --git a/...odegen/KotlinGenerator_TypeMappersTest.kt → ...odegen/KotlinGenerator_TypeMappersTest.kt b/...odegen/KotlinGenerator_TypeMappersTest.kt → ...odegen/KotlinGenerator_TypeMappersTest.kt
diff --git a/...a/com/yelp/codegen/KotlinLangUtilsTest.kt → ...a/com/yelp/codegen/KotlinLangUtilsTest.kt b/...a/com/yelp/codegen/KotlinLangUtilsTest.kt → ...a/com/yelp/codegen/KotlinLangUtilsTest.kt
diff --git a/...rc/test/java/com/yelp/codegen/MainTest.kt → ...rc/test/java/com/yelp/codegen/MainTest.kt b/...rc/test/java/com/yelp/codegen/MainTest.kt → ...rc/test/java/com/yelp/codegen/MainTest.kt
@@ -11,7 +11,7 @@ class MainTest {
     private fun runGenerator(platform: String) {
         val junitTestsSpecsPath = File(
             // Repo root
-            File(".").absoluteFile.parentFile.parentFile.absolutePath,
+            File(".").absoluteFile.parentFile.parentFile.parentFile.absolutePath,
             "samples${File.separator}junit-tests${File.separator}junit_tests_specs.json"
         ).path
 

diff --git a/.../java/com/yelp/codegen/StringUtilsTest.kt → .../java/com/yelp/codegen/StringUtilsTest.kt b/.../java/com/yelp/codegen/StringUtilsTest.kt → .../java/com/yelp/codegen/StringUtilsTest.kt
diff --git a/.../test/java/com/yelp/plugin/PluginTests.kt → .../test/java/com/yelp/plugin/PluginTests.kt b/.../test/java/com/yelp/plugin/PluginTests.kt → .../test/java/com/yelp/plugin/PluginTests.kt
diff --git a/plugin/src/test/testProject/build.gradle.kts → ...gin/src/test/testProject/build.gradle.kts b/plugin/src/test/testProject/build.gradle.kts → ...gin/src/test/testProject/build.gradle.kts
@@ -24,7 +24,7 @@ apply(plugin = "com.yelp.codegen.plugin")
 configure<GenerateTaskConfiguration> {
   platform = "kotlin"
   packageName = "com.yelp.codegen.samples"
-  // this file is in rootDir/plugin/build/testProject/
-  inputFile = file("../../../samples/junit-tests/junit_tests_specs.json")
+  // we are in rootDir/plugin-root/plugin/build/testProject/
+  inputFile = file("../../../../samples/junit-tests/junit_tests_specs.json")
   outputDir = file("./build/generatedSources")
 }
diff --git a/.../src/test/testProject/settings.gradle.kts → .../src/test/testProject/settings.gradle.kts b/.../src/test/testProject/settings.gradle.kts → .../src/test/testProject/settings.gradle.kts
diff --git a/gradle-plugin/settings.gradle.kts b/gradle-plugin/settings.gradle.kts
@@ -0,0 +1,9 @@
+pluginManagement {
+    repositories {
+        gradlePluginPortal()
+        mavenCentral()
+        jcenter()
+    }
+}
+
+include(":plugin")
diff --git a/gradle.properties b/gradle.properties
diff --git a/samples/groovy-android/build.gradle b/samples/groovy-android/build.gradle
@@ -1,6 +1,5 @@
 buildscript {
     repositories {
-        mavenLocal()
         gradlePluginPortal()
         google()
         mavenCentral()

diff --git a/samples/junit-tests/build.gradle b/samples/junit-tests/build.gradle
@@ -1,6 +1,5 @@
 buildscript {
     repositories {
-        mavenLocal()
         gradlePluginPortal()
         google()
         mavenCentral()

diff --git a/samples/kotlin-coroutines/build.gradle b/samples/kotlin-coroutines/build.gradle
@@ -1,6 +1,5 @@
 buildscript {
     repositories {
-        mavenLocal()
         gradlePluginPortal()
         google()
         mavenCentral()

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -1,6 +1,7 @@
+rootProject.name = "swagger-gradle-codegen"
+
 pluginManagement {
     repositories {
-        mavenLocal()
         gradlePluginPortal()
         mavenCentral()
         jcenter()
@@ -15,9 +16,11 @@ pluginManagement {
     }
 }
 
-include(":plugin",
+include(
         ":samples:junit-tests",
         ":samples:kotlin-android",
         ":samples:kotlin-android-moshi-codegen",
         ":samples:kotlin-coroutines",
         ":samples:groovy-android")
+
+includeBuild("gradle-plugin")