Skip to content

switch back to oss locking plugin (pending discussion) #146

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 5, 2026
Merged

switch back to oss locking plugin (pending discussion) #146

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: 2 additions & 4 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 @@ -21,15 +21,12 @@ import org.gradle.api.Plugin
import org.gradle.api.Project
import org.gradle.api.plugins.JavaPluginExtension
import org.gradle.api.problems.Problem
import org.gradle.api.problems.ProblemId
import org.gradle.api.problems.Problems
import org.gradle.api.problems.Severity
import org.gradle.api.provider.Provider
import org.gradle.api.provider.ProviderFactory
import org.gradle.api.publish.maven.tasks.PublishToMavenRepository
import org.gradle.api.tasks.TaskProvider
import org.gradle.api.tasks.testing.Test
import org.gradle.internal.deprecation.DeprecationLogger
import org.gradle.jvm.toolchain.JavaLanguageVersion
import org.gradle.jvm.toolchain.JavaToolchainService
import org.gradle.jvm.toolchain.JavaToolchainSpec
Expand Down Expand Up @@ -79,7 +76,8 @@ class NebulaPluginPlugin implements Plugin<Project> {
project.group = 'com.netflix.nebula'

project.afterEvaluate {
if(!project.pluginManager.hasPlugin("com.netflix.nebula.locks")){
if(!project.pluginManager.hasPlugin("com.netflix.nebula.locks") &&
!project.pluginManager.hasPlugin("com.netflix.nebula.dependency-lock")){
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: 3 additions & 1 deletion 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,7 +28,9 @@ class NebulaSettingsPlugin : Plugin<Settings> {
}
settings.gradle.allprojects {
pluginManager.apply("com.netflix.nebula.resolve")
pluginManager.apply("com.netflix.nebula.locks")
pluginManager.apply("com.netflix.nebula.dependency-lock")
// TODO discuss replacing OSS deplock plugin with internal convention plugin
// pluginManager.apply("com.netflix.nebula.locks")
}
}
}
7 changes: 5 additions & 2 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,18 +143,21 @@ 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 {
id("com.netflix.nebula.oss.settings")
}
}
subProject("sub1"){
subProject("sub1") {
plugins {
java()
}
}
subProject("sub2"){
subProject("sub2") {
plugins {
java()
}
Expand Down
Loading