Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(deps): Revert upgrade to asset-pipeline 4.4.0 #324

Merged
merged 1 commit into from
Mar 21, 2024
Merged

fix(deps): Revert upgrade to asset-pipeline 4.4.0 #324

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions .github/renovate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,6 @@
"^org\\.seleniumhq\\.selenium"
],
"groupName": "selenium monorepo"
},
{
"matchPackagePatterns": [
"^com\\.bertramlabs\\.plugins:asset-pipeline.*"
],
"groupName": "asset-pipeline"
}
]
}
4 changes: 2 additions & 2 deletions grails-forge-core/src/main/resources/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,12 +120,12 @@
<dependency>
<groupId>com.bertramlabs.plugins</groupId>
<artifactId>asset-pipeline-grails</artifactId>
<version>4.4.0</version>
<version>4.3.0</version>
</dependency>
<dependency>
<groupId>com.bertramlabs.plugins</groupId>
<artifactId>asset-pipeline-gradle</artifactId>
<version>4.4.0</version>
<version>4.3.0</version>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
Expand Down
8 changes: 4 additions & 4 deletions grails-forge-core/src/test/groovy/org/grails/forge/build/gradle/GradleSpec.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ class GradleSpec extends ApplicationContextSpec implements CommandOutputFixture
settingsGradle.contains("gradlePluginPortal()")
settingsGradle.contains("id \"org.grails.grails-web\" version \"6.1.2\"")
settingsGradle.contains("id \"org.grails.grails-gsp\" version \"6.1.2\"")
settingsGradle.contains("id \"com.bertramlabs.asset-pipeline\" version \"4.4.0\"")
settingsGradle.contains("id \"com.bertramlabs.asset-pipeline\" version \"4.3.0\"")
}

void "test settings.gradle for REST-API"() {
Expand All @@ -62,7 +62,7 @@ class GradleSpec extends ApplicationContextSpec implements CommandOutputFixture
settingsGradle.contains("id \"org.grails.grails-web\" version \"6.1.2\"")
settingsGradle.contains("id \"org.grails.plugins.views-json\" version \"3.1.2\"")
!settingsGradle.contains("id \"org.grails.grails-gsp\" version \"6.1.2\"")
!settingsGradle.contains("id \"com.bertramlabs.asset-pipeline\" version \"4.4.0\"")
!settingsGradle.contains("id \"com.bertramlabs.asset-pipeline\" version \"4.3.0\"")
}

void "test settings.gradle for REST-API for markup-views"() {
Expand All @@ -79,7 +79,7 @@ class GradleSpec extends ApplicationContextSpec implements CommandOutputFixture
settingsGradle.contains("id \"org.grails.grails-web\" version \"6.1.2\"")
settingsGradle.contains("id \"org.grails.plugins.views-markup\" version \"3.1.2\"")
!settingsGradle.contains("id \"org.grails.plugins.views-json\" version \"3.1.2\"")
!settingsGradle.contains("id \"org.grails.grails-gsp\" version \"6.1.1\"")
!settingsGradle.contains("id \"com.bertramlabs.asset-pipeline\" version \"4.4.0\"")
!settingsGradle.contains("id \"org.grails.grails-gsp\" version \"6.1.2\"")
!settingsGradle.contains("id \"com.bertramlabs.asset-pipeline\" version \"4.3.0\"")
}
}
4 changes: 2 additions & 2 deletions ...orge-core/src/test/groovy/org/grails/forge/feature/assetPipeline/AssetPipelineSpec.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ class AssetPipelineSpec extends ApplicationContextSpec implements CommandOutputF

expect:
buildSrcBuildGradle != null
buildSrcBuildGradle.contains("implementation(\"com.bertramlabs.plugins:asset-pipeline-gradle:4.4.0\")")
buildSrcBuildGradle.contains("implementation(\"com.bertramlabs.plugins:asset-pipeline-gradle:4.3.0\")")

}

Expand All @@ -40,7 +40,7 @@ class AssetPipelineSpec extends ApplicationContextSpec implements CommandOutputF

then:
template.contains("id \"com.bertramlabs.asset-pipeline\"")
template.contains("runtimeOnly(\"com.bertramlabs.plugins:asset-pipeline-grails:4.4.0\")")
template.contains("runtimeOnly(\"com.bertramlabs.plugins:asset-pipeline-grails:4.3.0\")")
template.contains('''
assets {
minifyJs = true
Expand Down
Loading