Skip to content

Commit 0e658df

Browse files
committed
remove pluginMarker
1 parent fae7a62 commit 0e658df

4 files changed

Lines changed: 3 additions & 11 deletions

File tree

build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,6 @@ tasks.named("librarianStaticContent").configure {
3939
}
4040

4141
extensions.getByType(NmcpAggregationExtension::class.java).localRepository {
42-
this.name = "testi"
42+
this.name = "test"
4343
this.path = "build/m23"
4444
}

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,5 @@ serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref
2424
ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
2525
gratatouille = { id = "com.gradleup.gratatouille", version.ref = "gratatouille-plugin" }
2626
librarian = { id = "com.gradleup.librarian", version = "0.2.2-SNAPSHOT-f89d61cb6d4bd03bb9f48d1c8220262c0d02094c" }
27-
nmcp = { id = "com.gradleup.nmcp", version = "1.4.2-SNAPSHOT-2f23b4e35da3935092b7c1ea190fb1c57728a7f9" }
27+
nmcp = { id = "com.gradleup.nmcp", version = "1.4.2-SNAPSHOT-9cc65e0d486a8b82f8b2e3039455eeb24a4bfd6d" }
2828
compat = { id = "com.gradleup.tapmoc", version = "0.4.1-SNAPSHOT-86d664ab69b813963b91060ecce036be943088ed" }

nmcp/build.gradle.kts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ Librarian.module(project)
1111
gratatouille {
1212
addDependencies = false
1313
pluginLocalPublication("com.gradleup.nmcp.settings")
14-
// Remove when https://github.com/GradleUp/nmcp/issues/232 is done.
15-
pluginMarker("com.gradleup.nmcp.aggregation")
1614
}
1715

1816
dependencies {
@@ -25,5 +23,5 @@ dependencies {
2523
}
2624

2725
tasks.withType(Test::class.java).configureEach {
28-
dependsOn("publishAllPublicationsToTestRepository", ":nmcp-tasks:publishAllPublicationsToTestRepository")
26+
dependsOn(":nmcpPublishAggregationToTestRepository")
2927
}

settings.gradle.kts

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,6 @@ pluginManagement {
2020
}
2121
}
2222

23-
gradle.lifecycle.afterProject {
24-
extensions.getByType(PublishingExtension::class.java).repositories.maven {
25-
name = "test"
26-
url = uri("file://${rootProject.layout.buildDirectory.get().asFile.resolve("m2").absolutePath}")
27-
}
28-
}
2923
rootProject.name = "nmcp-root"
3024

3125
include(":nmcp", ":nmcp-tasks")

0 commit comments

Comments
 (0)