From f255b4e04e4dc81ec989bf8bca1615f7c8e01b60 Mon Sep 17 00:00:00 2001 From: Devon Stewart Date: Sat, 13 May 2023 21:29:36 -0700 Subject: [PATCH 1/8] Bumping gradle --- README.md | 2 +- build.gradle | 8 ++++---- gradle/wrapper/gradle-wrapper.properties | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 4d039fd..68417e3 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ plugins { } repositories { - jcenter() + mavenCentral() } dependencies { diff --git a/build.gradle b/build.gradle index b7967cf..70d64db 100644 --- a/build.gradle +++ b/build.gradle @@ -12,7 +12,7 @@ java { } repositories { - jcenter() + mavenCentral() } dependencies { @@ -47,18 +47,18 @@ description = 'guardrail OpenAPI code generator plugin' task sourcesJar(type: Jar, dependsOn: classes) { from sourceSets.main.allSource classifier "sources" - extension "jar" + archiveExtension "jar" } task javadocJar(type: Jar, dependsOn: javadoc) { from javadoc.destinationDir classifier "javadoc" - extension "jar" + archiveExtension "jar" } publishing { publications { - mainMaven(MavenPublication) { + maven(MavenPublication) { from components.java artifact sourcesJar artifact javadocJar diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 442d913..070cb70 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From 14ca90fc1458d05f5930849631ec56c95936b1ab Mon Sep 17 00:00:00 2001 From: Devon Stewart Date: Sat, 13 May 2023 21:29:43 -0700 Subject: [PATCH 2/8] Bumping plugins --- build.gradle | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 70d64db..fbca589 100644 --- a/build.gradle +++ b/build.gradle @@ -1,9 +1,10 @@ plugins { id 'java-gradle-plugin' id 'groovy' - id 'com.gradle.plugin-publish' version '0.16.0' - id 'com.palantir.git-version' version '0.12.3' - id "maven-publish" + id 'com.gradle.plugin-publish' version '1.2.0' + id 'com.palantir.git-version' version '3.0.0' + id 'maven-publish' + id 'com.github.ben-manes.versions' version '0.46.0' } java { From 2ca621eb002e2c8eff89e3cbca4e3e11ba31e676 Mon Sep 17 00:00:00 2001 From: Devon Stewart Date: Sat, 13 May 2023 21:33:32 -0700 Subject: [PATCH 3/8] I guess this isn't necessary? --- build.gradle | 2 -- 1 file changed, 2 deletions(-) diff --git a/build.gradle b/build.gradle index fbca589..5a961cc 100644 --- a/build.gradle +++ b/build.gradle @@ -48,13 +48,11 @@ description = 'guardrail OpenAPI code generator plugin' task sourcesJar(type: Jar, dependsOn: classes) { from sourceSets.main.allSource classifier "sources" - archiveExtension "jar" } task javadocJar(type: Jar, dependsOn: javadoc) { from javadoc.destinationDir classifier "javadoc" - archiveExtension "jar" } publishing { From 35539308ca9c225633a23cf60189ca7ada36683f Mon Sep 17 00:00:00 2001 From: Devon Stewart Date: Sat, 13 May 2023 21:38:45 -0700 Subject: [PATCH 4/8] Unifying pluginBundle and gradlePlugin --- build.gradle | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/build.gradle b/build.gradle index 5a961cc..8886ace 100644 --- a/build.gradle +++ b/build.gradle @@ -43,7 +43,7 @@ group = 'dev.guardrail' version = gitVersion().substring(1) // gradle-git-version does not support leading `v` in `v0.1.2`: https://github.com/palantir/gradle-git-version/issues/72 -description = 'guardrail OpenAPI code generator plugin' +description = 'Principled code generation from OpenAPI specifications' task sourcesJar(type: Jar, dependsOn: classes) { from sourceSets.main.allSource @@ -67,10 +67,15 @@ publishing { gradlePlugin { + website = 'https://guardrail.dev/' + vcsUrl = 'https://github.com/guardrail-dev/guardrail' plugins { guardrailPlugin { id = project.group implementationClass = 'dev.guardrail.GuardrailGradlePlugin' + displayName = 'guardrail Gradle Plugin' + description = project.description + tags.set(['openapi', 'swagger', 'codegen', 'scala', 'java']) } } } @@ -94,16 +99,3 @@ check { // Run the functional tests as part of `check` dependsOn(tasks.functionalTest) } - -pluginBundle { - website = 'https://guardrail.dev/' - vcsUrl = 'https://github.com/guardrail-dev/guardrail' - description = 'Principled code generation from OpenAPI specifications' - tags = ['openapi', 'swagger', 'codegen', 'scala', 'java'] - - plugins { - guardrailPlugin { - displayName = 'guardrail gradle plugin' - } - } -} From 1cd6bd4727c525a2e478e5db672923c45c467167 Mon Sep 17 00:00:00 2001 From: Devon Stewart Date: Sat, 13 May 2023 21:44:05 -0700 Subject: [PATCH 5/8] Removing endpoints generator --- build.gradle | 1 - 1 file changed, 1 deletion(-) diff --git a/build.gradle b/build.gradle index 8886ace..0a2f1e0 100644 --- a/build.gradle +++ b/build.gradle @@ -29,7 +29,6 @@ dependencies { implementation "dev.guardrail:guardrail-java-support_2.12:0.65.2" implementation "dev.guardrail:guardrail-scala-akka-http_2.12:0.65.2" implementation "dev.guardrail:guardrail-scala-dropwizard_2.12:0.65.2" - implementation "dev.guardrail:guardrail-scala-endpoints_2.12:0.65.2" implementation "dev.guardrail:guardrail-scala-http4s_2.12:0.65.4" implementation "dev.guardrail:guardrail-scala-support_2.12:0.65.2" From 861c45a91a4f6e10820f8f13965a6990e6f4c796 Mon Sep 17 00:00:00 2001 From: Devon Stewart Date: Sat, 13 May 2023 21:44:35 -0700 Subject: [PATCH 6/8] Bumping guardrail modules --- build.gradle | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/build.gradle b/build.gradle index 0a2f1e0..c946fbf 100644 --- a/build.gradle +++ b/build.gradle @@ -20,17 +20,17 @@ dependencies { implementation gradleApi() implementation localGroovy() - implementation "dev.guardrail:guardrail_2.12:0.65.5" - implementation "dev.guardrail:guardrail-cli_2.12:0.65.2" - implementation "dev.guardrail:guardrail-core_2.12:0.65.4" - implementation "dev.guardrail:guardrail-java-async-http_2.12:0.65.2" - implementation "dev.guardrail:guardrail-java-dropwizard_2.12:0.65.2" - implementation "dev.guardrail:guardrail-java-spring-mvc_2.12:0.65.2" - implementation "dev.guardrail:guardrail-java-support_2.12:0.65.2" - implementation "dev.guardrail:guardrail-scala-akka-http_2.12:0.65.2" - implementation "dev.guardrail:guardrail-scala-dropwizard_2.12:0.65.2" - implementation "dev.guardrail:guardrail-scala-http4s_2.12:0.65.4" - implementation "dev.guardrail:guardrail-scala-support_2.12:0.65.2" + implementation "dev.guardrail:guardrail_2.12:0.71.0" + implementation "dev.guardrail:guardrail-cli_2.12:0.71.0" + implementation "dev.guardrail:guardrail-core_2.12:0.75.3" + implementation "dev.guardrail:guardrail-java-async-http_2.12:0.72.0" + implementation "dev.guardrail:guardrail-java-dropwizard_2.12:0.72.0" + implementation "dev.guardrail:guardrail-java-spring-mvc_2.12:0.71.2" + implementation "dev.guardrail:guardrail-java-support_2.12:0.73.1" + implementation "dev.guardrail:guardrail-scala-akka-http_2.12:0.76.0" + implementation "dev.guardrail:guardrail-scala-dropwizard_2.12:0.72.0" + implementation "dev.guardrail:guardrail-scala-http4s_2.12:0.76.0" + implementation "dev.guardrail:guardrail-scala-support_2.12:0.75.3" testImplementation('org.spockframework:spock-core:1.3-groovy-2.5') { exclude module: 'groovy-all' From dae3a4bf672f81e24e4f3515bb069140347e6cc6 Mon Sep 17 00:00:00 2001 From: Devon Stewart Date: Sat, 13 May 2023 21:45:12 -0700 Subject: [PATCH 7/8] 2.12 -> 2.13 --- build.gradle | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/build.gradle b/build.gradle index c946fbf..86c2032 100644 --- a/build.gradle +++ b/build.gradle @@ -20,17 +20,17 @@ dependencies { implementation gradleApi() implementation localGroovy() - implementation "dev.guardrail:guardrail_2.12:0.71.0" - implementation "dev.guardrail:guardrail-cli_2.12:0.71.0" - implementation "dev.guardrail:guardrail-core_2.12:0.75.3" - implementation "dev.guardrail:guardrail-java-async-http_2.12:0.72.0" - implementation "dev.guardrail:guardrail-java-dropwizard_2.12:0.72.0" - implementation "dev.guardrail:guardrail-java-spring-mvc_2.12:0.71.2" - implementation "dev.guardrail:guardrail-java-support_2.12:0.73.1" - implementation "dev.guardrail:guardrail-scala-akka-http_2.12:0.76.0" - implementation "dev.guardrail:guardrail-scala-dropwizard_2.12:0.72.0" - implementation "dev.guardrail:guardrail-scala-http4s_2.12:0.76.0" - implementation "dev.guardrail:guardrail-scala-support_2.12:0.75.3" + implementation "dev.guardrail:guardrail_2.13:0.71.0" + implementation "dev.guardrail:guardrail-cli_2.13:0.71.0" + implementation "dev.guardrail:guardrail-core_2.13:0.75.3" + implementation "dev.guardrail:guardrail-java-async-http_2.13:0.72.0" + implementation "dev.guardrail:guardrail-java-dropwizard_2.13:0.72.0" + implementation "dev.guardrail:guardrail-java-spring-mvc_2.13:0.71.2" + implementation "dev.guardrail:guardrail-java-support_2.13:0.73.1" + implementation "dev.guardrail:guardrail-scala-akka-http_2.13:0.76.0" + implementation "dev.guardrail:guardrail-scala-dropwizard_2.13:0.72.0" + implementation "dev.guardrail:guardrail-scala-http4s_2.13:0.76.0" + implementation "dev.guardrail:guardrail-scala-support_2.13:0.75.3" testImplementation('org.spockframework:spock-core:1.3-groovy-2.5') { exclude module: 'groovy-all' From c987810a5fa81836cbba468d43c65e4fa0f373f7 Mon Sep 17 00:00:00 2001 From: Devon Stewart Date: Sat, 13 May 2023 21:50:39 -0700 Subject: [PATCH 8/8] Bumping spock to match https://github.com/spockframework/spock-example/blob/master/build.gradle --- build.gradle | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 86c2032..482fc34 100644 --- a/build.gradle +++ b/build.gradle @@ -32,9 +32,8 @@ dependencies { implementation "dev.guardrail:guardrail-scala-http4s_2.13:0.76.0" implementation "dev.guardrail:guardrail-scala-support_2.13:0.75.3" - testImplementation('org.spockframework:spock-core:1.3-groovy-2.5') { - exclude module: 'groovy-all' - } + testImplementation platform("org.spockframework:spock-bom:2.3-groovy-3.0") + testImplementation "org.spockframework:spock-core" testImplementation 'cglib:cglib-nodep:3.3.0' }