Skip to content

Commit 3c75147

Browse files
jdaughertyjdaugherty
authored
Merge pull request #168 from jdaugherty/5.0.x
Clean-up for grails M1 release
2 parents cc390ff + 0afb919 commit 3c75147

File tree

8 files changed

+67
-124
lines changed

8 files changed

+67
-124
lines changed

‎.github/workflows/gradle.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
REDIS_PORT: 6379
3434
DEVELOCITY_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
3535
with:
36-
arguments: build -Dgeb.env=chromeHeadless
36+
arguments: build -U
3737
publish:
3838
if: github.event_name == 'push'
3939
needs: build

‎build.gradle‎

Lines changed: 16 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,17 @@
1-
plugins {
2-
id "java-library"
3-
id "org.grails.grails-gsp"
4-
id "org.grails.grails-plugin"
5-
}
6-
7-
version = project.projectVersion
8-
group = 'org.grails.plugins'
9-
10-
allprojects {
11-
12-
repositories {
13-
mavenCentral()
14-
maven { url "https://repo.grails.org/grails/core" }
15-
}
16-
17-
tasks.withType(GroovyCompile) {
18-
configure(groovyOptions) {
19-
forkOptions.jvmArgs = ['-Xmx1024m']
20-
}
21-
}
1+
if(!project.projectVersion.endsWith('-SNAPSHOT')) {
2+
apply plugin: "io.github.gradle-nexus.publish-plugin"
3+
}
4+
5+
allprojects {
6+
7+
repositories {
8+
mavenCentral()
9+
maven { url "https://repo.grails.org/grails/core" }
10+
}
11+
12+
tasks.withType(GroovyCompile) {
13+
configure(groovyOptions) {
14+
forkOptions.jvmArgs = ['-Xmx1024m']
15+
}
16+
}
2217
}

‎buildSrc/build.gradle‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,10 @@ apply from: "./loadProps.gradle"
33
repositories {
44
mavenCentral()
55
maven { url "https://repo.grails.org/grails/core" }
6-
maven {
7-
url = 'https://repo.gradle.org/gradle/libs-releases'
8-
description = 'Needed for Gradle Tooling API'
9-
}
106
}
7+
118
dependencies {
12-
implementation "com.bertramlabs.plugins:asset-pipeline-gradle:${assetPipelineGrailVersion}"
13-
implementation "org.grails:grails-gradle-plugin:${grailsVersion}"
14-
implementation "org.gradle:gradle-tooling-api:${gradleToolingApiVersion}"
9+
implementation "org.grails:grails-gradle-plugin:$grailsGradlePluginVersion"
10+
implementation "com.bertramlabs.plugins:asset-pipeline-gradle:$assetPipelineGradleVersion"
11+
implementation "io.github.gradle-nexus.publish-plugin:io.github.gradle-nexus.publish-plugin.gradle.plugin:2.0.0"
1512
}

‎examples/redis-demo/build.gradle‎

Lines changed: 24 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11

22
plugins {
3+
id "groovy"
34
id "war"
4-
id 'eclipse'
5-
id 'idea'
6-
id "org.grails.grails-web"
5+
id "idea"
76
id "com.bertramlabs.asset-pipeline"
7+
id "org.grails.grails-web"
88
id "org.grails.grails-gsp"
9-
id "application"
109
}
1110

1211
version = project.projectVersion
@@ -16,55 +15,42 @@ assets {
1615
minifyCss = true
1716
}
1817

19-
java {
20-
toolchain {
21-
languageVersion = JavaLanguageVersion.of(17)
22-
}
23-
}
24-
25-
repositories {
26-
mavenCentral()
27-
maven { url "https://repo.grails.org/grails/core" }
28-
}
18+
compileJava.options.release = 17
2919

3020
dependencies {
31-
implementation "org.springframework.boot:spring-boot-starter-logging"
32-
implementation "org.springframework.boot:spring-boot-autoconfigure"
33-
implementation "org.springframework.boot:spring-boot-starter-actuator"
34-
implementation "org.springframework.boot:spring-boot-starter-tomcat"
21+
implementation platform("org.grails:grails-bom:$grailsVersion")
22+
profile "org.grails.profiles:web"
3523
implementation "org.grails:grails-core"
36-
37-
implementation "org.grails:grails-web-boot"
3824
implementation "org.grails:grails-logging"
39-
implementation "org.grails:grails-plugin-rest"
4025
implementation "org.grails:grails-plugin-databinding"
4126
implementation "org.grails:grails-plugin-i18n"
27+
implementation "org.grails:grails-plugin-interceptors"
28+
implementation "org.grails:grails-plugin-rest"
4229
implementation "org.grails:grails-plugin-services"
4330
implementation "org.grails:grails-plugin-url-mappings"
44-
implementation "org.grails:grails-plugin-interceptors"
45-
46-
implementation "org.grails.plugins:cache:$cacheVersion"
47-
implementation "org.grails.plugins:async:$asyncVersion"
48-
implementation "org.grails.plugins:hibernate5:$gormVersion"
49-
implementation "org.hibernate:hibernate-core-jakarta:$hibernate5Version"
50-
implementation project(':grails-redis')
31+
implementation "org.grails:grails-web-boot"
5132
implementation "org.grails.plugins:gsp"
33+
implementation "org.grails.plugins:hibernate5"
34+
implementation "org.grails.plugins:scaffolding"
35+
implementation "org.springframework.boot:spring-boot-autoconfigure"
36+
implementation "org.springframework.boot:spring-boot-starter"
37+
implementation "org.springframework.boot:spring-boot-starter-actuator"
38+
implementation "org.springframework.boot:spring-boot-starter-logging"
39+
implementation "org.springframework.boot:spring-boot-starter-tomcat"
40+
implementation "org.springframework.boot:spring-boot-starter-validation"
5241
console "org.grails:grails-console"
53-
profile "org.grails.profiles:web"
54-
55-
runtimeOnly "org.glassfish.expressly:expressly:$expresslyVersion"
56-
runtimeOnly "com.h2database:h2:$h2Version"
42+
runtimeOnly "com.bertramlabs.plugins:asset-pipeline-grails"
43+
runtimeOnly "com.h2database:h2"
5744
runtimeOnly "org.apache.tomcat:tomcat-jdbc"
5845
runtimeOnly "jakarta.xml.bind:jakarta.xml.bind-api:$xmlBindApiVersion"
59-
runtimeOnly "com.bertramlabs.plugins:asset-pipeline-grails"
60-
46+
runtimeOnly "org.fusesource.jansi:jansi"
6147
testImplementation "org.grails:grails-gorm-testing-support"
62-
testImplementation "org.mockito:mockito-core"
6348
testImplementation "org.grails:grails-web-testing-support"
64-
}
49+
testImplementation "org.spockframework:spock-core"
6550

66-
application {
67-
mainClass.set("com.example.Application")
51+
implementation "org.grails.plugins:cache"
52+
implementation "org.grails.plugins:async"
53+
implementation project(':grails-redis')
6854
}
6955

7056
assets {

‎examples/redis-demo/test-apps‎

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎gradle.properties‎

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,17 @@
11
projectVersion=5.0.0-SNAPSHOT
22

3-
assetPipelineGrailVersion=5.0.4
4-
asyncVersion=6.0.0-SNAPSHOT
5-
cacheVersion=8.0.0-SNAPSHOT
3+
# Grails
4+
grailsVersion=7.0.0-M1
5+
grailsGradlePluginVersion=7.0.0-M3
6+
assetPipelineGradleVersion=5.0.5
7+
8+
# Project specific
69
commonsPool2Version=2.12.0
7-
expresslyVersion=5.0.0
8-
gradleToolingApiVersion=8.10.2
9-
grailsGradlePluginVersion=7.0.0-SNAPSHOT
10-
grailsVersion=7.0.0-SNAPSHOT
1110
gormVersion=9.0.0-SNAPSHOT
12-
groovyVersion=4.0.23
1311
gsonVersion=2.11.0
14-
h2Version=2.3.232
15-
hibernate5Version=5.6.15.Final
16-
javaParserCoreVersion=3.26.2
1712
jredisVersion=5.2.0
18-
scaffoldingVersion=6.0.0-SNAPSHOT
13+
14+
# Example specific
1915
xmlBindApiVersion=4.0.2
2016

2117
org.gradle.caching=true

‎plugin/build.gradle‎

Lines changed: 11 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,16 @@
11
plugins {
2-
id "java-library"
3-
id "eclipse"
4-
id "idea"
5-
id "org.grails.grails-plugin"
2+
id 'java-library'
3+
id 'eclipse'
4+
id 'idea'
5+
id 'org.grails.grails-plugin'
6+
id "org.grails.grails-gsp"
7+
id 'org.grails.grails-publish'
68
}
79

810
version = project.projectVersion
9-
group = "org.grails.plugins"
11+
group = 'org.grails.plugins'
1012

11-
apply plugin: 'org.grails.grails-publish'
12-
13-
java {
14-
toolchain {
15-
languageVersion = JavaLanguageVersion.of(17)
16-
}
17-
}
18-
19-
dependencyManagement {
20-
imports {
21-
mavenBom "org.grails:grails-bom:$grailsVersion"
22-
}
23-
applyMavenExclusions false
24-
}
13+
compileJava.options.release = 17
2514

2615
configurations {
2716
documentation.extendsFrom compileClasspath
@@ -32,13 +21,8 @@ configurations {
3221
}
3322
}
3423

35-
repositories {
36-
mavenCentral()
37-
maven { url "https://repo.grails.org/grails/core" }
38-
}
39-
4024
dependencies {
41-
implementation 'org.springframework.boot:spring-boot-starter-logging'
25+
implementation "org.springframework.boot:spring-boot-starter-logging"
4226
implementation "org.springframework.boot:spring-boot-starter-actuator"
4327
implementation "org.springframework.boot:spring-boot-autoconfigure"
4428
implementation "org.springframework.boot:spring-boot-starter-tomcat"
@@ -52,7 +36,7 @@ dependencies {
5236
api "redis.clients:jedis:$jredisVersion"
5337
api "com.google.code.gson:gson:$gsonVersion"
5438

55-
documentation("com.github.javaparser:javaparser-core:$javaParserCoreVersion") {
39+
documentation("com.github.javaparser:javaparser-core") {
5640
transitive = false
5741
}
5842
}
@@ -82,4 +66,4 @@ grailsPublish {
8266
'davidseiler': 'David Seiler', 'jordonsaardchit': 'Jordon Saardchit', 'florianlangenhahn': 'Florian Langenhahn',
8367
'germansancho': 'German Sancho', 'johnmulhern': 'John Mulhern', 'shaunjurgemeyer': 'Shaun Jurgemeyer',
8468
'puneetbehl': 'Puneet Behl']
85-
}
69+
}

‎settings.gradle‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,10 @@ buildCache {
2929
}
3030
}
3131

32-
rootProject.name = "grails-redis"
32+
rootProject.name = "grails-redis-root"
3333

34-
include "examples-redis-demo"
3534
include 'plugin'
36-
37-
project(":examples-redis-demo").projectDir = [settingsDir, 'examples/redis-demo'] as File
38-
39-
4035
findProject(':plugin').name = 'grails-redis'
4136

42-
43-
37+
include "examples-redis-demo"
38+
project(":examples-redis-demo").projectDir = [settingsDir, 'examples/redis-demo'] as File

0 commit comments

Comments
 (0)