Skip to content

Commit dcc7239

Browse files
committed
Fixes after review from @matrei - thank you!
1 parent ff81c7a commit dcc7239

File tree

5 files changed

+29
-65
lines changed

5 files changed

+29
-65
lines changed

.github/workflows/gradle.yml

Lines changed: 4 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -2,40 +2,17 @@ name: "Java CI"
22
on:
33
push:
44
branches:
5-
- '[4-9]+.[0-9]+.x'
5+
- master
6+
- 'grails_[0-9]+.x'
67
pull_request:
78
branches:
8-
- '[4-9]+.[0-9]+.x'
9+
- master
10+
- 'grails_[0-9]+.x'
911
workflow_dispatch:
1012
jobs:
11-
test_project:
12-
name: "Test Project"
13-
runs-on: ubuntu-24.04
14-
strategy:
15-
fail-fast: true
16-
matrix:
17-
java: [17, 21]
18-
steps:
19-
- name: "📥 Checkout repository"
20-
uses: actions/checkout@v4
21-
- name: "☕️ Setup JDK"
22-
uses: actions/setup-java@v4
23-
with:
24-
java-version: ${{ matrix.java }}
25-
distribution: liberica
26-
- name: "🐘 Setup Gradle"
27-
uses: gradle/actions/setup-gradle@v4
28-
with:
29-
develocity-access-key: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
30-
- name: "🏃 Run tests"
31-
run: ./gradlew check
32-
- name: "🏃 Run integration tests"
33-
working-directory: ./examples/testapp1
34-
run: ./gradlew integrationTest
3513
publish_snapshot:
3614
if: github.event_name == 'push' || github.event_name == 'workflow_dispatch'
3715
name: "Build Project and Publish Snapshot release"
38-
needs: test_project
3916
runs-on: ubuntu-24.04
4017
permissions:
4118
contents: write # updates gh-pages branch

.github/workflows/release-notes.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
push:
66
branches:
77
- master
8-
- '[4-9]+.[0-9]+.x'
8+
- 'grails_[0-9]+.x'
99
pull_request:
1010
types: [opened, reopened, synchronize]
1111
pull_request_target:

build.gradle

Lines changed: 22 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import java.time.format.DateTimeFormatter
55
buildscript {
66
repositories {
77
mavenCentral()
8-
maven { url "https://repo.grails.org/grails/restricted" }
8+
maven { url = 'https://repo.grails.org/grails/restricted' }
99
maven {
1010
url = 'https://repository.apache.org/content/groups/snapshots'
1111
content {
@@ -15,39 +15,30 @@ buildscript {
1515
}
1616
dependencies {
1717
classpath platform("org.apache.grails:grails-bom:$grailsVersion")
18-
classpath "org.apache.grails:grails-gradle-plugins"
18+
classpath 'org.apache.grails:grails-gradle-plugins'
1919
}
2020
}
21+
2122
apply plugin: 'groovy'
2223
apply plugin: 'java-library'
2324
apply plugin: 'org.apache.grails.gradle.grails-plugin'
2425
apply plugin: 'org.apache.grails.gradle.grails-publish'
2526

26-
group "org.grails.plugins"
27+
group = 'org.grails.plugins'
2728

2829
ext {
29-
buildInstant = java.util.Optional.ofNullable(System.getenv("SOURCE_DATE_EPOCH"))
30+
buildInstant = java.util.Optional.ofNullable(System.getenv('SOURCE_DATE_EPOCH'))
3031
.filter(s -> !s.isEmpty())
3132
.map(Long::parseLong)
3233
.map(Instant::ofEpochSecond)
33-
.orElseGet(Instant::now)
34+
.orElseGet(Instant::now) as Instant
3435
formattedBuildDate = DateTimeFormatter.ISO_INSTANT.format(buildInstant)
35-
buildDate = (buildInstant as Instant).atZone(ZoneOffset.UTC) // for reproducible builds
36-
37-
publishArtifactId = 'grails-spring-security-oauth2-google'
38-
pomTitle = 'Spring Security Oauth2 Google Provider'
39-
pomDescription = 'This plugin provides the oauth2 Google provider for grails-spring-security-oauth2 plugin.'
40-
pomDevelopers = [
41-
MatrixCrawler: 'Johannes Brunswicker',
42-
rvanderwerf : 'Ryan Vanderwerf',
43-
sbglasius : 'Søren Berg Glasius',
44-
]
45-
36+
buildDate = buildInstant.atZone(ZoneOffset.UTC) // for reproducible builds
4637
}
4738

4839
repositories {
4940
mavenCentral()
50-
maven { url "https://repo.grails.org/grails/restricted" }
41+
maven { url = 'https://repo.grails.org/grails/restricted' }
5142
maven {
5243
url = 'https://repository.apache.org/content/groups/snapshots'
5344
content {
@@ -58,32 +49,28 @@ repositories {
5849

5950
dependencies {
6051
implementation platform("org.apache.grails:grails-bom:$grailsVersion")
61-
compileOnly "org.springframework.boot:spring-boot-starter-logging"
62-
compileOnly "org.springframework.boot:spring-boot-starter-validation"
63-
compileOnly "org.springframework.boot:spring-boot-autoconfigure"
64-
compileOnly "org.springframework.boot:spring-boot-starter"
65-
compileOnly "org.apache.grails:grails-core"
66-
profile "org.apache.grails.profiles:plugin"
67-
runtimeOnly "org.fusesource.jansi:jansi"
52+
compileOnly 'org.springframework.boot:spring-boot-starter-logging'
53+
compileOnly 'org.springframework.boot:spring-boot-starter-validation'
54+
compileOnly 'org.springframework.boot:spring-boot-autoconfigure'
55+
compileOnly 'org.springframework.boot:spring-boot-starter'
56+
compileOnly 'org.apache.grails:grails-core'
6857

69-
implementation 'org.apache.grails:grails-spring-security:7.0.0-M5'
70-
implementation 'org.apache.grails:grails-spring-security-oauth2:7.0.0-M5'
58+
implementation 'org.apache.grails:grails-spring-security:7.0.0-SNAPSHOT'
59+
implementation 'org.apache.grails:grails-spring-security-oauth2:7.0.0-SNAPSHOT'
7160
}
7261

7362
grailsPublish {
7463
githubSlug = 'grails-plugins/grails-spring-security-oauth2-google'
7564
license {
7665
name = 'Apache-2.0'
7766
}
78-
title = pomTitle
79-
desc = pomDescription
80-
developers = pomDevelopers
67+
title = 'Spring Security Oauth2 Google Provider'
68+
desc = 'This plugin provides the oauth2 Google provider for grails-spring-security-oauth2 plugin.'
69+
developers = [
70+
MatrixCrawler: 'Johannes Brunswicker',
71+
rvanderwerf : 'Ryan Vanderwerf',
72+
sbglasius : 'Søren Berg Glasius',
73+
]
8174
}
8275

83-
8476
compileJava.options.release = javaVersion.toInteger()
85-
86-
tasks.withType(Test) {
87-
useJUnitPlatform()
88-
}
89-

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version=1.0.0-SNAPSHOT
1+
version=2.0.0-SNAPSHOT
22
grailsVersion=7.0.0-SNAPSHOT
33
javaVersion=17
44

settings.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ develocity {
1717
server = 'https://ge.grails.org'
1818
buildScan {
1919
tag('grails-plugins')
20-
tag('grails-mail')
20+
tag(rootProject.name)
2121
publishing.onlyIf { it.authenticated }
2222
uploadInBackground = isLocal
2323
}

0 commit comments

Comments
 (0)