Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bumping gradle #155

Merged
merged 8 commits into from
May 14, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ plugins {
}

repositories {
jcenter()
mavenCentral()
}

dependencies {
Expand Down
63 changes: 26 additions & 37 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -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 {
Expand All @@ -12,53 +13,49 @@ java {
}

repositories {
jcenter()
mavenCentral()
}

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-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"

testImplementation('org.spockframework:spock-core:1.3-groovy-2.5') {
exclude module: 'groovy-all'
}
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 platform("org.spockframework:spock-bom:2.3-groovy-3.0")
testImplementation "org.spockframework:spock-core"
testImplementation 'cglib:cglib-nodep:3.3.0'
}

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
classifier "sources"
extension "jar"
}

task javadocJar(type: Jar, dependsOn: javadoc) {
from javadoc.destinationDir
classifier "javadoc"
extension "jar"
}

publishing {
publications {
mainMaven(MavenPublication) {
maven(MavenPublication) {
from components.java
artifact sourcesJar
artifact javadocJar
Expand All @@ -68,10 +65,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'])
}
}
}
Expand All @@ -95,16 +97,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'
}
}
}
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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