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

Upgrade to Gradle 7.2 #12

Merged
merged 14 commits into from
Feb 27, 2024
2 changes: 1 addition & 1 deletion .github/workflows/build-and-publish.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
jobs:
build-and-publish:
name: Java Gradle
uses: bakdata/ci-templates/.github/workflows/java-gradle-plugin.yaml@1.40.8
uses: bakdata/ci-templates/.github/workflows/java-gradle-plugin.yaml@1.41.0
secrets:
sonar-token: ${{ secrets.SONARCLOUD_TOKEN }}
sonar-organization: ${{ secrets.SONARCLOUD_ORGANIZATION }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ on:
jobs:
java-gradle-release:
name: Java Gradle
uses: bakdata/ci-templates/.github/workflows/java-gradle-release.yaml@1.40.8
uses: bakdata/ci-templates/.github/workflows/java-gradle-release.yaml@1.41.0
with:
release-type: "${{ inputs.release-type }}"
secrets:
Expand Down
2 changes: 1 addition & 1 deletion avro/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
kotlin("jvm")
id("org.jetbrains.dokka") version "0.9.17"
id("org.jetbrains.dokka") version "1.9.10"
}
apply(plugin = "org.gradle.kotlin.kotlin-dsl")

Expand Down
41 changes: 13 additions & 28 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,19 +1,11 @@
import net.researchgate.release.GitAdapter.GitConfig
import net.researchgate.release.ReleaseExtension

buildscript {
dependencies {
classpath("org.gradle.kotlin:plugins:1.2.0")
classpath("com.gradle.publish:plugin-publish-plugin:0.11.0")
}
}

plugins {
// release
id("net.researchgate.release") version "2.8.1"
id("com.bakdata.sonar") version "1.1.14"
id("com.bakdata.sonatype") version "1.1.14"
id("org.hildan.github.changelog") version "0.8.0"
id("net.researchgate.release") version "3.0.2"
id("com.bakdata.sonar") version "1.1.17"
id("com.bakdata.sonatype") version "1.2.1"
id("org.hildan.github.changelog") version "1.13.1"
id("org.gradle.kotlin.kotlin-dsl") version "2.1.6" apply false
id("com.gradle.plugin-publish") version "1.2.1" apply false
}

allprojects {
Expand Down Expand Up @@ -46,6 +38,11 @@ configure<org.hildan.github.changelog.plugin.GitHubChangelogExtension> {
subprojects {
apply(plugin = "java")

configure<JavaPluginExtension> {
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
}

dependencies {
"testRuntimeOnly"("org.junit.jupiter:junit-jupiter-engine:5.7.2")
"testImplementation"("org.junit.jupiter:junit-jupiter-api:5.7.2")
Expand All @@ -69,32 +66,20 @@ if (!version.toString().endsWith("-SNAPSHOT")) {
id = "com.bakdata.${project.name}"
implementationClass = "com.bakdata.gradle.${project.name.capitalize()}Plugin"
description = project.description
displayName = "Bakdata $name plugin"
}
}
}
// actual block of plugin portal config, need to be done on each subproject as the plugin does not support multi-module projects yet...
configure<com.gradle.publish.PluginBundleExtension> {
website = "https://github.com/bakdata/gradle-avro-dependency-plugin"
vcsUrl = "https://github.com/bakdata/gradle-avro-dependency-plugin"
(plugins) {
"${name.capitalize()}Plugin" {
displayName = "Bakdata $name plugin"
tags = listOf("bakdata", name)
}
}
tags = listOf("bakdata", name)
}
}
}
}
}

fun ReleaseExtension.git(configure: GitConfig.() -> Unit) = (getProperty("git") as GitConfig).configure()

release {
git {
requireBranch = "main"
}
}

val sonarqube by tasks
sonarqube.enabled = false //FIXME requires Java 17
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
5 changes: 3 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#Thu Jan 17 14:34:36 CET 2019
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
Loading
Loading