Skip to content

Commit 2ed3fe9

Browse files
committed
enable GMM and remove obsolete idea plugin
1 parent 010aa80 commit 2ed3fe9

File tree

2 files changed

+1
-28
lines changed

2 files changed

+1
-28
lines changed

src/main/groovy/nebula/plugin/netflixossproject/NetflixOssProjectPlugin.groovy

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ import org.gradle.api.plugins.JavaPluginExtension
4040
import org.gradle.api.publish.maven.tasks.PublishToMavenRepository
4141
import org.gradle.api.tasks.TaskProvider
4242
import org.gradle.plugins.ide.eclipse.EclipsePlugin
43-
import org.gradle.plugins.ide.idea.IdeaPlugin
4443

4544
class NetflixOssProjectPlugin implements Plugin<Project> {
4645
@Override
@@ -125,7 +124,6 @@ class NetflixOssProjectPlugin implements Plugin<Project> {
125124
}
126125
}
127126
project.plugins.apply InfoPlugin
128-
project.plugins.apply IdeaPlugin
129127
project.plugins.apply EclipsePlugin
130128

131129

src/main/groovy/nebula/plugin/netflixossproject/publishing/PublishingPlugin.groovy

Lines changed: 1 addition & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -36,33 +36,8 @@ class PublishingPlugin implements Plugin<Project> {
3636
}
3737

3838
project.rootProject.tasks.named('postRelease').configure {
39-
it.dependsOn( project.tasks.withType(PublishToMavenRepository))
39+
it.dependsOn(project.tasks.withType(PublishToMavenRepository))
4040
}
4141
}
42-
43-
44-
project.plugins.withId('com.github.johnrengelman.shadow') {
45-
configureGradleModuleMetadata(project)
46-
}
47-
project.plugins.withId('com.gradleup.shadow') {
48-
configureGradleModuleMetadata(project)
49-
}
50-
}
51-
52-
private void configureGradleModuleMetadata(Project project) {
53-
boolean gradleModuleMetadataPublishingForShadowPluginEnabled = FeatureFlags.isFeatureEnabled(project, FeatureFlags.GRADLE_METADATA_SHADOW_PUBLISHING_SUPPORT, false)
54-
if(gradleModuleMetadataPublishingForShadowPluginEnabled) {
55-
return
56-
}
57-
disableGradleModuleMetadataTask(project)
58-
}
59-
60-
private void disableGradleModuleMetadataTask(Project project) {
61-
project.tasks.withType(GenerateModuleMetadata).configureEach(new Action<GenerateModuleMetadata>() {
62-
@Override
63-
void execute(GenerateModuleMetadata generateModuleMetadataTask) {
64-
generateModuleMetadataTask.enabled = false
65-
}
66-
})
6742
}
6843
}

0 commit comments

Comments
 (0)