Skip to content

Commit

Permalink
Merge pull request #100 from xenit-eu/support-gradle-8
Browse files Browse the repository at this point in the history
Support Gradle 8
  • Loading branch information
vierbergenlars authored Aug 6, 2024
2 parents f1e6292 + 27984dd commit 8e4b8ea
Show file tree
Hide file tree
Showing 28 changed files with 374 additions and 486 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
fetch-depth: 0
- uses: actions/setup-java@v1
with:
java-version: 11
java-version: 17
- name: Check
run: ./gradlew check
- name: Upload analysis to sonarcloud
Expand Down
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,13 @@

## Unreleased

## Version 1.2.0 - 2024-08-07

* [#100](https://github.com/xenit-eu/alfresco-gradle-sdk/pull/100) Support for Gradle 8

> [!warning]
> This release drops support for Gradle versions <7.1 and Java <11
## Version 1.1.0 - 2021-08-20

### New features
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
> [products](https://xenit.eu/alfresco-products), please visit our [website](https://xenit.eu).
Gradle plugins and tasks to support Alfresco development.
Gradle 5.1 and above are supported.
Gradle 7.1 and above are supported.

## Usage

Expand Down
23 changes: 10 additions & 13 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
plugins {
id "java-gradle-plugin"
id "com.gradle.plugin-publish" version "0.21.0"
id 'org.ajoberstar.reckon' version "0.13.2"
id 'org.sonarqube' version '4.3.1.3277'
id 'be.vbgn.ci-detect' version '0.5.0'
id 'be.vbgn.dev-conventions' version '0.5.3'
Expand All @@ -12,7 +11,11 @@ plugins {

group 'eu.xenit.gradle'

sourceCompatibility = 1.8
java {
toolchain {
languageVersion = JavaLanguageVersion.of(11)
}
}

repositories {
mavenCentral()
Expand All @@ -29,14 +32,14 @@ sourceSets {
}

configurations {
integrationTestCompile.extendsFrom testCompile
integrationTestRuntime.extendsFrom testRuntime
integrationTestCompileClasspath.extendsFrom testCompileClasspath
integrationTestRuntimeClasspath.extendsFrom testRuntimeClasspath
}

dependencies {
compile gradleApi()
testCompile group: 'junit', name: 'junit', version: '4.13.2'
testCompile group: 'commons-io', name: 'commons-io', version: '2.13.0'
implementation gradleApi()
testImplementation group: 'junit', name: 'junit', version: '4.13.2'
testImplementation group: 'commons-io', name: 'commons-io', version: '2.13.0'
}
import org.gradle.util.GradleVersion

Expand Down Expand Up @@ -103,9 +106,3 @@ pluginBundle {
}
}

reckon {
scopeFromProp()
snapshotFromProp()
}

reckonTagCreate.dependsOn(check)
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
3 changes: 2 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading

0 comments on commit 8e4b8ea

Please sign in to comment.