Skip to content

Commit 435145e

Browse files
authored
Enable GMM when shadow plugin is used (this works now) (#87)
update to latest version of plugin-plugin (self) and gradle plugin publish plugin
1 parent 530260f commit 435145e

File tree

3 files changed

+17
-39
lines changed

3 files changed

+17
-39
lines changed

build.gradle.kts

Lines changed: 15 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616
plugins {
17-
id("com.netflix.nebula.plugin-plugin") version "23.+"
17+
id("com.netflix.nebula.plugin-plugin") version "24.+"
1818
`kotlin-dsl`
1919
}
2020

@@ -23,34 +23,29 @@ description = "Project plugin for Nebula plugins"
2323
contacts {
2424
addPerson("nebula-plugins-oss@netflix.com") {
2525
moniker = "Nebula Plugins Maintainers"
26-
github = "nebula-plugins"
26+
github = "nebula-plugins"
2727
}
2828
}
2929

30-
repositories {
31-
mavenCentral()
32-
gradlePluginPortal()
33-
}
34-
3530
dependencies {
3631
compileOnly("io.github.gradle-nexus:publish-plugin:2.0.0")
37-
implementation ("com.netflix.nebula:nebula-oss-publishing-plugin:latest.release")
38-
implementation ("com.netflix.nebula:gradle-contacts-plugin:latest.release")
39-
implementation ("com.netflix.nebula:gradle-dependency-lock-plugin:latest.release")
40-
implementation ("com.netflix.nebula:gradle-info-plugin:latest.release")
41-
implementation ("com.netflix.nebula:gradle-java-cross-compile-plugin:latest.release")
42-
implementation ("com.netflix.nebula:nebula-publishing-plugin:latest.release")
43-
implementation ("com.netflix.nebula:nebula-project-plugin:latest.release")
44-
implementation ("com.netflix.nebula:nebula-release-plugin:latest.release")
45-
implementation ("com.netflix.nebula:nebula-gradle-interop:latest.release")
32+
implementation("com.netflix.nebula:nebula-oss-publishing-plugin:latest.release")
33+
implementation("com.netflix.nebula:gradle-contacts-plugin:latest.release")
34+
implementation("com.netflix.nebula:gradle-dependency-lock-plugin:latest.release")
35+
implementation("com.netflix.nebula:gradle-info-plugin:latest.release")
36+
implementation("com.netflix.nebula:gradle-java-cross-compile-plugin:latest.release")
37+
implementation("com.netflix.nebula:nebula-publishing-plugin:latest.release")
38+
implementation("com.netflix.nebula:nebula-project-plugin:latest.release")
39+
implementation("com.netflix.nebula:nebula-release-plugin:latest.release")
40+
implementation("com.netflix.nebula:nebula-gradle-interop:latest.release")
4641
implementation("com.netflix.nebula:gradle-info-plugin:latest.release")
47-
implementation (platform("com.fasterxml.jackson:jackson-bom:2.14.+"))
42+
implementation(platform("com.fasterxml.jackson:jackson-bom:2.14.+"))
4843

49-
implementation ("com.gradle.publish:plugin-publish-plugin:1.3.1")
44+
implementation("com.gradle.publish:plugin-publish-plugin:2.+")
5045

5146
testImplementation("com.netflix.nebula:nebula-test:latest.release")
5247
testImplementation("org.ajoberstar.grgit:grgit-core:4.1.1") {
53-
exclude (group= "org.codehaus.groovy", module= "groovy")
48+
exclude(group = "org.codehaus.groovy", module = "groovy")
5449
}
5550
testImplementation("org.mock-server:mockserver-netty:5.15.0")
5651
}
@@ -88,7 +83,7 @@ java {
8883
}
8984
testing {
9085
suites {
91-
named<JvmTestSuite>("test"){
86+
named<JvmTestSuite>("test") {
9287
useJUnitJupiter()
9388
targets.all {
9489
testTask.configure {

gradle.lockfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=inte
2929
com.google.j2objc:j2objc-annotations:1.3=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
3030
com.googlecode.javaewah:JavaEWAH:1.1.12=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
3131
com.googlecode.libphonenumber:libphonenumber:8.11.1=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
32-
com.gradle.publish:plugin-publish-plugin:1.3.1=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
32+
com.gradle.publish:plugin-publish-plugin:1.3.1=integTestCompileClasspath,integTestRuntimeClasspath
33+
com.gradle.publish:plugin-publish-plugin:2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
3334
com.jayway.jsonpath:json-path:2.7.0=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
3435
com.jcraft:jzlib:1.1.2=runtimeClasspath
3536
com.jcraft:jzlib:1.1.3=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath

src/main/groovy/nebula/plugin/plugin/NebulaPluginPlugin.groovy

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -90,11 +90,6 @@ class NebulaPluginPlugin implements Plugin<Project> {
9090
repositories {
9191
maven {
9292
url = 'https://plugins.gradle.org/m2/'
93-
metadataSources {
94-
mavenPom()
95-
artifact()
96-
ignoreGradleMetadataRedirection()
97-
}
9893
}
9994
mavenCentral()
10095
}
@@ -170,10 +165,6 @@ class NebulaPluginPlugin implements Plugin<Project> {
170165
}
171166
}
172167
}
173-
174-
plugins.withId('com.github.johnrengelman.shadow') {
175-
disableGradleModuleMetadataTask(project)
176-
}
177168
}
178169

179170
project.afterEvaluate {
@@ -203,13 +194,4 @@ class NebulaPluginPlugin implements Plugin<Project> {
203194
}
204195

205196
}
206-
207-
private void disableGradleModuleMetadataTask(Project project) {
208-
project.tasks.withType(GenerateModuleMetadata).configureEach(new Action<GenerateModuleMetadata>() {
209-
@Override
210-
void execute(GenerateModuleMetadata generateModuleMetadataTask) {
211-
generateModuleMetadataTask.enabled = false
212-
}
213-
})
214-
}
215197
}

0 commit comments

Comments
 (0)