-
Notifications
You must be signed in to change notification settings - Fork 8
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #100 from grails/merge-4.1.x-into-5.0.x
Merge 4.1.x into 5.0.x
- Loading branch information
Showing
5 changed files
with
82 additions
and
72 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,60 +1,60 @@ | ||
| plugins { | ||
| id "groovy" | ||
| id "org.grails.grails-web" | ||
| id "org.grails.grails-gsp" | ||
| id "war" | ||
| id "idea" | ||
| id "com.bertramlabs.asset-pipeline" version "5.0.1" | ||
| id "eclipse" | ||
| buildscript { | ||
| repositories { | ||
| maven { url = 'https://repo.grails.org/grails/core' } | ||
| mavenCentral() | ||
| } | ||
| dependencies { | ||
| classpath "org.grails:grails-gradle-plugin:$grailsGradlePluginVersion" | ||
| } | ||
| } | ||
|
|
||
| group = "org.demo.spock" | ||
| apply plugin: 'groovy' | ||
| apply plugin: 'org.grails.grails-web' | ||
| apply plugin: 'org.grails.grails-gsp' | ||
|
|
||
| group = 'org.demo.spock' | ||
|
|
||
| repositories { | ||
| maven { url = 'https://repo.grails.org/grails/core' } | ||
| mavenCentral() | ||
| maven { url "https://repo.grails.org/grails/core/" } | ||
| maven { url "https://repository.apache.org/content/repositories/snapshots"} | ||
| } | ||
|
|
||
| dependencies { | ||
| profile("org.grails.profiles:web") | ||
| implementation("org.grails:grails-core") | ||
| implementation("org.grails:grails-logging") | ||
| implementation("org.grails:grails-plugin-databinding") | ||
| implementation("org.grails:grails-plugin-i18n") | ||
| implementation("org.grails:grails-plugin-interceptors") | ||
| implementation("org.grails:grails-plugin-rest") | ||
| implementation("org.grails:grails-plugin-services") | ||
| implementation("org.grails:grails-plugin-url-mappings") | ||
| implementation("org.grails:grails-web-boot") | ||
| implementation("org.grails.plugins:gsp") | ||
| implementation("org.grails.plugins:hibernate5") | ||
| implementation("org.grails.plugins:scaffolding") | ||
| implementation("org.sitemesh:grails-plugin-sitemesh3:7.0.0-SNAPSHOT") | ||
| implementation("org.springframework.boot:spring-boot-autoconfigure") | ||
| implementation("org.springframework.boot:spring-boot-starter") | ||
| implementation("org.springframework.boot:spring-boot-starter-actuator") | ||
| implementation("org.springframework.boot:spring-boot-starter-logging") | ||
| implementation("org.springframework.boot:spring-boot-starter-tomcat") | ||
| implementation("org.springframework.boot:spring-boot-starter-validation") | ||
| console("org.grails:grails-console") | ||
| runtimeOnly("com.bertramlabs.plugins:asset-pipeline-grails") | ||
| runtimeOnly("com.h2database:h2") | ||
| runtimeOnly("org.apache.tomcat:tomcat-jdbc") | ||
| runtimeOnly("org.fusesource.jansi:jansi") | ||
|
|
||
| implementation 'org.grails:grails-core' | ||
| implementation 'org.grails:grails-logging' | ||
| implementation 'org.grails:grails-plugin-databinding' | ||
| implementation 'org.grails:grails-plugin-i18n' | ||
| implementation 'org.grails:grails-plugin-interceptors' | ||
| implementation 'org.grails:grails-plugin-rest' | ||
| implementation 'org.grails:grails-plugin-services' | ||
| implementation 'org.grails:grails-plugin-url-mappings' | ||
| implementation 'org.grails:grails-web-boot' | ||
| implementation 'org.grails.plugins:gsp' | ||
| implementation 'org.grails.plugins:hibernate5' | ||
| implementation 'org.grails.plugins:scaffolding' | ||
| implementation 'org.springframework.boot:spring-boot-autoconfigure' | ||
| implementation 'org.springframework.boot:spring-boot-starter' | ||
| implementation 'org.springframework.boot:spring-boot-starter-actuator' | ||
| implementation 'org.springframework.boot:spring-boot-starter-logging' | ||
| implementation 'org.springframework.boot:spring-boot-starter-tomcat' | ||
| implementation 'org.springframework.boot:spring-boot-starter-validation' | ||
|
|
||
| runtimeOnly 'com.bertramlabs.plugins:asset-pipeline-grails' | ||
| runtimeOnly 'com.h2database:h2' | ||
| runtimeOnly 'org.apache.tomcat:tomcat-jdbc' | ||
| runtimeOnly 'org.fusesource.jansi:jansi' | ||
|
|
||
| testImplementation 'org.grails:grails-gorm-testing-support' | ||
| testImplementation 'org.grails:grails-web-testing-support' | ||
| testImplementation 'org.spockframework:spock-core' | ||
|
|
||
| integrationTestImplementation testFixtures(project(':geb')) | ||
| testImplementation("org.grails:grails-gorm-testing-support") | ||
| testImplementation("org.grails:grails-web-testing-support") | ||
| testImplementation("org.spockframework:spock-core") | ||
| } | ||
|
|
||
| compileJava.options.release = 17 | ||
|
|
||
| tasks.withType(Test) { | ||
| tasks.withType(Test).configureEach { | ||
| useJUnitPlatform() | ||
| systemProperty 'grails.geb.recording.mode', 'RECORD_ALL' | ||
| } | ||
| assets { | ||
| minifyJs = true | ||
| minifyCss = true | ||
| } | ||
| systemProperty('grails.geb.recording.mode', 'RECORD_ALL') | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +0,0 @@ | ||
| repositories { | ||
| mavenCentral() | ||
| maven { url "https://repo.grails.org/grails/core/" } | ||
| maven { url "https://repository.apache.org/content/repositories/snapshots"} | ||
| } | ||
| dependencies { | ||
| implementation platform("org.grails:grails-bom:7.0.0-SNAPSHOT") | ||
| implementation("org.grails:grails-gradle-plugin:7.0.0-SNAPSHOT") | ||
| implementation("org.grails.plugins:hibernate5:9.0.0-SNAPSHOT") | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,17 +1,31 @@ | ||
| plugins { | ||
| id 'com.gradle.develocity' version '3.18.2' | ||
| id 'com.gradle.common-custom-user-data-gradle-plugin' version '2.0.2' | ||
| } | ||
|
|
||
| def isCI = System.getenv('CI') != null | ||
| def isLocal = !isCI | ||
| def isAuthenticated = System.getenv('DEVELOCITY_ACCESS_KEY') != null | ||
|
|
||
| pluginManagement { | ||
| repositories { | ||
| mavenLocal() | ||
| maven { url "https://repo.grails.org/grails/core/" } | ||
| gradlePluginPortal() | ||
| develocity { | ||
| server = 'https://ge.grails.org' | ||
| buildScan { | ||
| tag('grails') | ||
| tag('grails/geb') | ||
| publishing.onlyIf { isAuthenticated } | ||
| uploadInBackground = isLocal | ||
| } | ||
| plugins { | ||
| id "org.grails.grails-web" version "7.0.0-SNAPSHOT" | ||
| id "org.grails.grails-gsp" version "7.0.0-SNAPSHOT" | ||
| } | ||
|
|
||
| buildCache { | ||
| local { enabled = isLocal } | ||
| remote(develocity.buildCache) { | ||
| push = isCI && isAuthenticated | ||
| enabled = true | ||
| } | ||
| } | ||
|
|
||
| rootProject.name="spock-container-test-app" | ||
| include 'geb' | ||
| rootProject.name = 'spock-container-test-app' | ||
|
|
||
| include 'geb' | ||
| project(':geb').projectDir = file('..') |