From fc2b332c0ef290de4065969388afd5e42c40cc83 Mon Sep 17 00:00:00 2001 From: Scott Murphy Heiberg Date: Thu, 10 Oct 2024 19:35:27 -0700 Subject: [PATCH 1/3] Update build env --- .github/workflows/gradle.yml | 4 ++-- .github/workflows/release.yml | 2 +- .sdkmanrc | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 .sdkmanrc diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 97602aa..2ac45cc 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -18,7 +18,7 @@ jobs: - name: Set up JDK uses: actions/setup-java@v4 with: - distribution: 'adopt' + distribution: 'librca' java-version: '11' - name: Run Build uses: gradle/gradle-build-action@v3 @@ -37,7 +37,7 @@ jobs: - name: Set up JDK uses: actions/setup-java@v4 with: - distribution: 'adopt' + distribution: 'librca' java-version: '11' - name: Publish Artifacts (repo.grails.org) id: publish diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9ccd32f..f17f8e6 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -19,7 +19,7 @@ jobs: - name: Set up JDK uses: actions/setup-java@v4 with: - distribution: 'adopt' + distribution: 'librca' java-version: ${{ matrix.java }} - name: Set the current release version id: release_version diff --git a/.sdkmanrc b/.sdkmanrc new file mode 100644 index 0000000..e2a1d58 --- /dev/null +++ b/.sdkmanrc @@ -0,0 +1 @@ +java=11.0.24-librca From 9b0b9f929c34e36e5cb6137b4bc09e66d47152bd Mon Sep 17 00:00:00 2001 From: Scott Murphy Heiberg Date: Thu, 10 Oct 2024 19:35:34 -0700 Subject: [PATCH 2/3] Don't force grails-dependencies --- build.gradle | 10 +++------- gradle.properties | 1 + 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/build.gradle b/build.gradle index 7fc3148..23a4271 100644 --- a/build.gradle +++ b/build.gradle @@ -25,15 +25,11 @@ dependencyManagement { } dependencies { - api "org.grails:grails-dependencies" - api "org.grails:grails-web-boot" - - api "org.grails.plugins:fields:$fieldsVersion" - - console "org.grails:grails-console" + compileOnly "org.codehaus.groovy:groovy" + compileOnly "org.grails:grails-plugin-rest" + api "org.grails.plugins:fields:$fieldsVersion" } - grailsPublish { userOrg = "grails" githubSlug = 'grails/scaffolding' diff --git a/gradle.properties b/gradle.properties index 961a250..64528f0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,7 @@ projectVersion=5.1.3-SNAPSHOT grailsVersion=6.2.0 fieldsVersion=5.1.0 +groovyVersion=3.0.22 org.gradle.caching=true org.gradle.daemon=true From a80a21b77be340f896700bc0dcb332054512dd42 Mon Sep 17 00:00:00 2001 From: Scott Murphy Heiberg Date: Thu, 10 Oct 2024 19:39:42 -0700 Subject: [PATCH 3/3] liberica --- .github/workflows/gradle.yml | 4 ++-- .github/workflows/release.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 2ac45cc..460b09f 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -18,7 +18,7 @@ jobs: - name: Set up JDK uses: actions/setup-java@v4 with: - distribution: 'librca' + distribution: 'liberica' java-version: '11' - name: Run Build uses: gradle/gradle-build-action@v3 @@ -37,7 +37,7 @@ jobs: - name: Set up JDK uses: actions/setup-java@v4 with: - distribution: 'librca' + distribution: 'liberica' java-version: '11' - name: Publish Artifacts (repo.grails.org) id: publish diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f17f8e6..0c2bcdd 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -19,7 +19,7 @@ jobs: - name: Set up JDK uses: actions/setup-java@v4 with: - distribution: 'librca' + distribution: 'liberica' java-version: ${{ matrix.java }} - name: Set the current release version id: release_version