Skip to content

Commit 60537fa

Browse files
authored
Merge pull request #81 from nebula-plugins/gmm
enable GMM and remove obsolete idea plugin
2 parents 010aa80 + 2650dc3 commit 60537fa

File tree

5 files changed

+2
-35
lines changed

5 files changed

+2
-35
lines changed

.github/workflows/nebula.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Nebula Build
22
on:
33
push:
44
branches:
5-
- '*'
5+
- 'main'
66
tags:
77
- v*.*.*
88
- v*.*.*-rc.*

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 & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,10 @@
1515
*/
1616
package nebula.plugin.netflixossproject.publishing
1717

18-
import nebula.plugin.netflixossproject.FeatureFlags
1918
import nebula.plugin.publishing.NebulaOssPublishingPlugin
20-
import org.gradle.api.Action
2119
import org.gradle.api.Plugin
2220
import org.gradle.api.Project
2321
import org.gradle.api.publish.maven.tasks.PublishToMavenRepository
24-
import org.gradle.api.publish.tasks.GenerateModuleMetadata
2522

2623
class PublishingPlugin implements Plugin<Project> {
2724

@@ -36,33 +33,8 @@ class PublishingPlugin implements Plugin<Project> {
3633
}
3734

3835
project.rootProject.tasks.named('postRelease').configure {
39-
it.dependsOn( project.tasks.withType(PublishToMavenRepository))
36+
it.dependsOn(project.tasks.withType(PublishToMavenRepository))
4037
}
4138
}
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-
})
6739
}
6840
}

src/test/groovy/nebula/plugin/netflixossproject/NetflixOssMultiProjectSpec.groovy

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ class NetflixOssMultiProjectSpec extends ProjectSpec {
5151
plugin | _
5252
NebulaOssPublishingPlugin | _
5353
InfoPlugin | _
54-
IdeaPlugin | _
5554
EclipsePlugin | _
5655
}
5756

@@ -65,7 +64,6 @@ class NetflixOssMultiProjectSpec extends ProjectSpec {
6564
plugin | _
6665
NebulaOssPublishingPlugin | _
6766
InfoPlugin | _
68-
IdeaPlugin | _
6967
EclipsePlugin | _
7068
DependencyLockPlugin | _
7169
JavadocJarPlugin | _

src/test/groovy/nebula/plugin/netflixossproject/NetflixOssProjectPluginSpec.groovy

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ class NetflixOssProjectPluginSpec extends PluginProjectSpec {
5858
DependencyLockPlugin | _
5959
OssLicensePlugin | _
6060
EclipsePlugin | _
61-
IdeaPlugin | _
6261
}
6362

6463
def 'plugin sets default java version'() {

0 commit comments

Comments
 (0)