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.

Sign up for GitHub

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 8.4 #12

Merged
merged 4 commits into from
Feb 22, 2024
Merged

Upgrade to Gradle 8.4 #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2df4377
Upgrade to Gradle 7.6
philipp94831 Feb 21, 2024
e25577d
Upgrade to Gradle 7.6
philipp94831 Feb 21, 2024
412222a
Upgrade to Gradle 8.4
philipp94831 Feb 22, 2024
853c73a
Upgrade to Gradle 8.4
philipp94831 Feb 22, 2024
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 .github/workflows/build-and-publish.yaml
View file
Open in desktop
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/[email protected].5
uses: bakdata/ci-templates/.github/workflows/[email protected].6
secrets:
sonar-token: ${{ secrets.SONARCLOUD_TOKEN }}
sonar-organization: ${{ secrets.SONARCLOUD_ORGANIZATION }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yaml
View file
Open in desktop
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/[email protected].5
uses: bakdata/ci-templates/.github/workflows/[email protected].6
with:
release-type: "${{ inputs.release-type }}"
secrets:
Expand Down
21 changes: 14 additions & 7 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
plugins {
// release
id("net.researchgate.release") version "2.6.0"
id("com.bakdata.sonar") version "1.1.4"
id("com.bakdata.sonatype") version "1.1.4"
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.1.14"
id("org.hildan.github.changelog") version "2.2.0"
}

allprojects {
Expand Down Expand Up @@ -40,9 +40,10 @@ configure<org.hildan.github.changelog.plugin.GitHubChangelogExtension> {
subprojects {
apply(plugin = "java-library")

configure<JavaPluginConvention> {
sourceCompatibility = org.gradle.api.JavaVersion.VERSION_11
targetCompatibility = org.gradle.api.JavaVersion.VERSION_11
configure<JavaPluginExtension> {
toolchain {
languageVersion = JavaLanguageVersion.of(11)
}
}

dependencies {
Expand All @@ -62,5 +63,11 @@ subprojects {
}
}

release {
git {
requireBranch.set("master")
}
}

val sonarqube by tasks
sonarqube.enabled = false //FIXME requires Java 17
4 changes: 0 additions & 4 deletions generic-avro-reflect/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
plugins {
`java-library`
}

description = "Generates an Avro schema from any Java object at runtime"

dependencies {
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
View file
Open in desktop
Binary file not shown.
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Fri Mar 01 09:37:38 CET 2019
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
Loading
Loading