Skip to content

switch to Nebula OSS locking opinion #150

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

Merged
wakingrufus merged 1 commit into from
Aug 18, 2026
Merged

switch to Nebula OSS locking opinion #150

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
4 changes: 2 additions & 2 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ gradlePlugin {
create("com.netflix.nebula.resolve") {
id = "com.netflix.nebula.resolve"
displayName = "Nebula Dependency Resolve Plugin"
description = "Used to trigger dependency resolution on all configurations of all projects"
description = "Nebula OSS Internal use ONLY"
implementationClass = "com.netflix.nebula.convention.ResolvePlugin"
tags.set(listOf("nebula"))
compatibility {
Expand All @@ -119,7 +119,7 @@ gradlePlugin {
create("com.netflix.nebula.locks") {
id = "com.netflix.nebula.locks"
displayName = "Nebula Dependency Locks Plugin"
description = "opinionated dependency locking for nebula projects"
description = "Nebula OSS Internal use ONLY"
implementationClass = "com.netflix.nebula.convention.DependencyLockingPlugin"
tags.set(listOf("nebula"))
compatibility {
Expand Down
3 changes: 1 addition & 2 deletions src/main/groovy/nebula/plugin/plugin/NebulaPluginPlugin.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,7 @@ class NebulaPluginPlugin implements Plugin<Project> {
project.group = 'com.netflix.nebula'

project.afterEvaluate {
if(!project.pluginManager.hasPlugin("com.netflix.nebula.locks") &&
!project.pluginManager.hasPlugin("com.netflix.nebula.dependency-lock")){
if(!project.pluginManager.hasPlugin("com.netflix.nebula.locks")) {
Problem problem = problems.reporter.create(NebulaProblems.OSS_SETTINGS) {
it.details("locking convention is not found. using com.netflix.nebula.plugin-plugin without the oss.settings plugin is deprecated")
it.solution("apply the 'com.netflix.nebula.oss.settings' plugin in settings.gradle.kts")
Expand Down
4 changes: 1 addition & 3 deletions src/main/kotlin/com/netflix/nebula/oss/settings/NebulaSettingsPlugin.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,7 @@ class NebulaSettingsPlugin : Plugin<Settings> {
}
settings.gradle.allprojects {
pluginManager.apply("com.netflix.nebula.resolve")
pluginManager.apply("com.netflix.nebula.dependency-lock")
// TODO discuss replacing OSS deplock plugin with internal convention plugin
// pluginManager.apply("com.netflix.nebula.locks")
pluginManager.apply("com.netflix.nebula.locks")
}
}
}
3 changes: 0 additions & 3 deletions src/test/kotlin/com/netflix/nebula/oss/settings/NebulaSettingsPluginTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,9 +143,6 @@ class NebulaSettingsPluginTest {
properties {
buildCache(true)
configurationCache(true)

// will no longer be needed when we switch to internal convention plugin
property("systemProp.nebula.features.coreLockingSupport","true")
}
settings {
plugins {
Expand Down
Loading