Skip to content

Commit 05b90a2

Browse files
authored
Merge pull request #14948 from apache/assetPluginForkingCompiler
feature: adopt the asset plugin forking compiler
2 parents 7701c80 + 3110b4d commit 05b90a2

File tree

8 files changed

+56
-9
lines changed

8 files changed

+56
-9
lines changed

build.gradle

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,15 @@ allprojects {
5757
includeVersionByRegex('org[.]apache[.](grails|groovy).*', '.*', '.*-SNAPSHOT')
5858
}
5959
}
60+
maven {
61+
url = 'https://central.sonatype.com/repository/maven-snapshots'
62+
content {
63+
includeVersionByRegex('cloud[.]wondrify.*', '.*', '.*-SNAPSHOT')
64+
}
65+
mavenContent {
66+
snapshotsOnly()
67+
}
68+
}
6069
}
6170
}
6271

buildSrc/build.gradle

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,15 @@ repositories {
3838
}
3939
}
4040
maven { url = 'https://repo.grails.org/grails/restricted' }
41+
maven {
42+
url = 'https://central.sonatype.com/repository/maven-snapshots'
43+
content {
44+
includeVersionByRegex('cloud[.]wondrify.*', '.*', '.*-SNAPSHOT')
45+
}
46+
mavenContent {
47+
snapshotsOnly()
48+
}
49+
}
4150
mavenCentral()
4251
gradlePluginPortal()
4352
}

dependencies.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ ext {
2525
'ant.version' : '1.10.15',
2626
'asciidoctor-gradle-jvm.version' : '4.0.4',
2727
'asciidoctorj.version' : '3.0.0',
28-
'asset-pipeline-gradle.version' : '5.0.12',
28+
'asset-pipeline-gradle.version' : '5.0.14',
2929
'byte-buddy.version' : '1.17.6',
3030
'commons-text.version' : '1.13.1',
3131
'directory-watcher.version' : '0.19.1',
@@ -73,7 +73,7 @@ ext {
7373
]
7474

7575
bomDependencyVersions = [
76-
'asset-pipeline-grails.version': '5.0.12',
76+
'asset-pipeline-grails.version': '5.0.14',
7777
'bootstrap-icons.version' : '1.13.1',
7878
'bootstrap.version' : '5.3.7',
7979
'commons-codec.version' : '1.18.0',

gradle/functional-test-config.gradle

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -54,13 +54,6 @@ configurations.configureEach {
5454
}
5555
}
5656

57-
// work around for parallel builds due to https://github.com/wondrify/asset-pipeline/issues/177
58-
if ('assetCompile' in tasks.names) {
59-
tasks.named('assetCompile').configure { Task task ->
60-
task.outputs.dir rootProject.layout.buildDirectory.dir('asset-serialize')
61-
}
62-
}
63-
6457
List<String> debugArguments = [
6558
'-Xmx2g', '-Xdebug', '-Xnoagent', '-Djava.compiler=NONE',
6659
'-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005'

grails-forge/build.gradle

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,15 @@ allprojects {
6363
includeGroupByRegex('org[.]apache[.]grails.*')
6464
}
6565
}
66+
maven {
67+
url = 'https://central.sonatype.com/repository/maven-snapshots'
68+
content {
69+
includeVersionByRegex('cloud[.]wondrify.*', '.*', '.*-SNAPSHOT')
70+
}
71+
mavenContent {
72+
snapshotsOnly()
73+
}
74+
}
6675
}
6776

6877
tasks.withType(Test).configureEach { Task testTask ->

grails-forge/buildSrc/build.gradle

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,15 @@ repositories {
5757
includeGroupByRegex('org[.]apache[.]grails.*')
5858
}
5959
}
60+
maven {
61+
url = 'https://central.sonatype.com/repository/maven-snapshots'
62+
content {
63+
includeVersionByRegex('cloud[.]wondrify.*', '.*', '.*-SNAPSHOT')
64+
}
65+
mavenContent {
66+
snapshotsOnly()
67+
}
68+
}
6069
}
6170

6271
configurations.configureEach {

grails-gradle/build.gradle

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,15 @@ allprojects {
3636
includeVersionByRegex('org[.]apache[.](grails|groovy).*', '.*', '.*SNAPSHOT')
3737
}
3838
}
39+
maven {
40+
url = 'https://central.sonatype.com/repository/maven-snapshots'
41+
content {
42+
includeVersionByRegex('cloud[.]wondrify.*', '.*', '.*-SNAPSHOT')
43+
}
44+
mavenContent {
45+
snapshotsOnly()
46+
}
47+
}
3948
}
4049

4150
props.forEach { k, v -> project.ext.set(k as String, v) }

grails-gradle/buildSrc/build.gradle

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,15 @@ repositories {
2929
// mavenLocal()
3030
mavenCentral()
3131
gradlePluginPortal()
32+
maven {
33+
url = 'https://central.sonatype.com/repository/maven-snapshots'
34+
content {
35+
includeVersionByRegex('cloud[.]wondrify.*', '.*', '.*-SNAPSHOT')
36+
}
37+
mavenContent {
38+
snapshotsOnly()
39+
}
40+
}
3241
}
3342

3443
file('../../gradle.properties').withInputStream {

0 commit comments

Comments
 (0)