diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index b2aa1723..02edcdc1 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -19,7 +19,7 @@ jobs: uses: actions/setup-java@v4 with: distribution: 'adopt' - java-version: '8' + java-version: '11' - name: Run Build id: build uses: gradle/gradle-build-action@v2 @@ -39,7 +39,7 @@ jobs: uses: actions/setup-java@v4 with: distribution: 'adopt' - java-version: '8' + java-version: '11' - name: Publish Artifacts (repo.grails.org) id: publish uses: gradle/gradle-build-action@v2 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 359df0d5..c2e74750 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -7,7 +7,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - java: ['8'] + java: ['11'] env: GIT_USER_NAME: puneetbehl GIT_USER_EMAIL: behlp@objectcomputing.com diff --git a/build.gradle b/build.gradle index 072f4544..a749b558 100644 --- a/build.gradle +++ b/build.gradle @@ -19,7 +19,7 @@ repositories { version project.projectVersion ext { - commonBuild = 'https://raw.githubusercontent.com/grails/grails-common-build/master' + commonBuild = 'https://raw.githubusercontent.com/grails/grails-common-build/v2.0.1' } subprojects { @@ -69,6 +69,9 @@ subprojects { apply plugin: 'idea' apply plugin: 'java-library' apply plugin: "org.grails.grails-plugin" + + sourceCompatibility = 1.11 + targetCompatibility = 1.11 } else { apply from: "${commonBuild}/common-project.gradle" } @@ -82,4 +85,4 @@ subprojects { } } -apply from: "${commonBuild}/common-publishing.gradle" \ No newline at end of file +apply from: "${commonBuild}/common-publishing.gradle" diff --git a/examples/grails-multi-datastore-app/build.gradle b/examples/grails-multi-datastore-app/build.gradle index 6c5e5a37..abbe3c0f 100755 --- a/examples/grails-multi-datastore-app/build.gradle +++ b/examples/grails-multi-datastore-app/build.gradle @@ -5,7 +5,7 @@ repositories { dependencies { implementation "org.springframework.boot:spring-boot-starter-logging" implementation "org.springframework.boot:spring-boot-autoconfigure" - implementation "org.grails:grails-core:5.3.2" + implementation "org.grails:grails-core" implementation "org.springframework.boot:spring-boot-starter-actuator" implementation "org.springframework.boot:spring-boot-starter-tomcat" implementation "org.grails:grails-plugin-url-mappings" diff --git a/gradle.properties b/gradle.properties index 89e48f84..fc1668e9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,8 +9,8 @@ developers=James Kleeh gormVersion=7.3.4 gormHibernateVersion=7.3.1 gormMongoDbVersion=7.0.0.RELEASE -grailsVersion=5.3.3 -grailsGradlePluginVersion=5.3.0 +grailsVersion=6.1.0 +grailsGradlePluginVersion=6.1.0 grailsDocsVersion=3.3.2 groovyVersion=3.0.11 junitJupiterVersion=5.9.3 @@ -25,7 +25,7 @@ viewsJsonVersion=2.3.2 servletApiVersion=4.0.1 cglibNodepVersion=3.2.9 objenesisVersion=3.3 -jansiVersion=1.18 +jansiVersion=2.4.1 hibernateEcacheVersion=5.6.7.Final hibernateCoreVersion=5.6.11.Final org.gradle.daemon=true diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 53b9e380..068cdb2d 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.9.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists