Skip to content

Commit 01d3dd5

Browse files
martinbonninmartinbonnin
authored
Enable classloader isolation (#211)
1 parent d3132b3 commit 01d3dd5

25 files changed

Lines changed: 112 additions & 113 deletions

‎build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import com.gradleup.librarian.gradle.Librarian
33
plugins {
44
alias(libs.plugins.kgp).apply(false)
55
alias(libs.plugins.ksp).apply(false)
6-
alias(libs.plugins.ggp).apply(false)
6+
alias(libs.plugins.gratatouille.wiring).apply(false)
77
alias(libs.plugins.librarian).apply(false)
88
alias(libs.plugins.nmcp).apply(false)
99
alias(libs.plugins.compat).apply(false)

‎gradle/libs.versions.toml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
[versions]
22
kgp = "2.2.20"
3-
ksp = "2.2.20-2.0.3"
4-
gratatouille-runtime = "0.1.1"
5-
gratatouille-plugin = "0.1.2-SNAPSHOT-907e08d6a0b673cfd6c2ff7cadb548362e636cb7"
3+
ksp = "2.3.2"
4+
gratatouille-runtime = "0.1.3"
5+
gratatouille-plugin = "0.1.3"
66

77
[libraries]
88
json = "org.jetbrains.kotlinx:kotlinx-serialization-json:1.8.1"
@@ -21,7 +21,8 @@ gratatouille-tasks-runtime = { module = "com.gradleup.gratatouille:gratatouille-
2121
kgp = { id = "org.jetbrains.kotlin.jvm", version.ref = "kgp" }
2222
serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kgp" }
2323
ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
24-
ggp = { id = "com.gradleup.gratatouille", version.ref = "gratatouille-plugin" }
24+
gratatouille-wiring = { id = "com.gradleup.gratatouille.wiring", version.ref = "gratatouille-plugin" }
25+
gratatouille-tasks = { id = "com.gradleup.gratatouille.tasks", version.ref = "gratatouille-plugin" }
2526
librarian = { id = "com.gradleup.librarian", version = "0.2.2-SNAPSHOT-44b68f3cb157b53cd19d63b93c6eeae967d1da4a" }
2627
nmcp = { id = "com.gradleup.nmcp", version = "1.2.1-SNAPSHOT-e592afcb0bceeb0cfd7adec28f8f3580a01831ff" }
2728
compat = { id = "com.gradleup.compat.patrouille", version = "0.0.1-SNAPSHOT-9da44b3b93e36a196ae5afc9f7a79a46a82763cd" }

‎nmcp-tasks/api/nmcp-tasks.api‎

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
public final class nmcp/internal/task/CleanupDirectoryEntryPoint {
2+
public static final field Companion Lnmcp/internal/task/CleanupDirectoryEntryPoint$Companion;
3+
public fun <init> ()V
4+
public static final fun run (Ljava/lang/String;)V
5+
}
6+
7+
public final class nmcp/internal/task/CleanupDirectoryEntryPoint$Companion {
8+
public final fun run (Ljava/lang/String;)V
9+
}
10+
11+
public final class nmcp/internal/task/NmcpFindDeploymentNameEntryPoint {
12+
public static final field Companion Lnmcp/internal/task/NmcpFindDeploymentNameEntryPoint$Companion;
13+
public fun <init> ()V
14+
public static final fun run (Ljava/util/List;Ljava/io/File;)V
15+
}
16+
17+
public final class nmcp/internal/task/NmcpFindDeploymentNameEntryPoint$Companion {
18+
public final fun run (Ljava/util/List;Ljava/io/File;)V
19+
}
20+
21+
public final class nmcp/internal/task/NmcpPublishFileByFileToFileSystemEntryPoint {
22+
public static final field Companion Lnmcp/internal/task/NmcpPublishFileByFileToFileSystemEntryPoint$Companion;
23+
public fun <init> ()V
24+
public static final fun run (Ljava/util/function/BiConsumer;Ljava/lang/String;Ljava/util/List;I)V
25+
}
26+
27+
public final class nmcp/internal/task/NmcpPublishFileByFileToFileSystemEntryPoint$Companion {
28+
public final fun run (Ljava/util/function/BiConsumer;Ljava/lang/String;Ljava/util/List;I)V
29+
}
30+
31+
public final class nmcp/internal/task/NmcpPublishFileByFileToSnapshotsEntryPoint {
32+
public static final field Companion Lnmcp/internal/task/NmcpPublishFileByFileToSnapshotsEntryPoint$Companion;
33+
public fun <init> ()V
34+
public static final fun run (Ljava/util/function/BiConsumer;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/List;I)V
35+
}
36+
37+
public final class nmcp/internal/task/NmcpPublishFileByFileToSnapshotsEntryPoint$Companion {
38+
public final fun run (Ljava/util/function/BiConsumer;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/List;I)V
39+
}
40+
41+
public final class nmcp/internal/task/NmcpPublishWithPublisherApiEntryPoint {
42+
public static final field Companion Lnmcp/internal/task/NmcpPublishWithPublisherApiEntryPoint$Companion;
43+
public fun <init> ()V
44+
public static final fun run (Ljava/util/function/BiConsumer;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Long;Ljava/lang/Long;Ljava/io/File;)V
45+
}
46+
47+
public final class nmcp/internal/task/NmcpPublishWithPublisherApiEntryPoint$Companion {
48+
public final fun run (Ljava/util/function/BiConsumer;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Long;Ljava/lang/Long;Ljava/io/File;)V
49+
}
50+
51+
public abstract interface class nmcp/transport/Content {
52+
public abstract fun writeTo (Lokio/BufferedSink;)V
53+
}
54+
55+
public final class nmcp/transport/PublishFileByFileKt {
56+
public static final fun publishFileByFile (Ljava/io/File;Ljava/io/File;)V
57+
public static final fun publishFileByFile (Lnmcp/transport/Transport;Ljava/util/List;)V
58+
public static final fun publishFileByFile (Lnmcp/transport/Transport;Ljava/util/List;I)V
59+
}
60+
61+
public abstract interface class nmcp/transport/Transport {
62+
public abstract fun get (Ljava/lang/String;)Lokio/BufferedSource;
63+
public abstract fun put (Ljava/lang/String;Lnmcp/transport/Content;)V
64+
}
65+
66+
public final class nmcp/transport/TransportKt {
67+
public static final fun toRequestBody (Lnmcp/transport/Content;)Lokhttp3/RequestBody;
68+
}
69+

‎nmcp-tasks/build.gradle.kts‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
import com.gradleup.librarian.gradle.Librarian
2+
3+
plugins {
4+
alias(libs.plugins.kgp)
5+
alias(libs.plugins.ksp)
6+
id("com.gradleup.gratatouille.tasks")
7+
alias(libs.plugins.serialization)
8+
}
9+
10+
Librarian.module(project)
11+
12+
gratatouille {
13+
codeGeneration {
14+
addDependencies.set(false)
15+
classLoaderIsolation()
16+
}
17+
}
18+
19+
dependencies {
20+
implementation(libs.json)
21+
implementation(libs.okio)
22+
implementation(libs.coroutines)
23+
api(libs.gratatouille.tasks.runtime) {
24+
because("publishFileByFile requires GInputFiles")
25+
}
26+
api(libs.okhttp)
27+
implementation(libs.xmlutil)
28+
29+
testImplementation(libs.kotlin.test)
30+
}

nmcp/src/main/kotlin/nmcp/internal/task/deleteDirectory.kt renamed to nmcp-tasks/src/main/kotlin/nmcp/internal/task/deleteDirectory.kt

File renamed without changes.

nmcp/src/main/kotlin/nmcp/internal/task/layout.kt renamed to nmcp-tasks/src/main/kotlin/nmcp/internal/task/layout.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
package nmcp.internal.task
22

3-
import org.gradle.internal.declarativedsl.parsing.parse
4-
53
/**
64
* See https://maven.apache.org/repositories/layout.html
75
*/

nmcp/src/main/kotlin/nmcp/internal/task/metadata.kt renamed to nmcp-tasks/src/main/kotlin/nmcp/internal/task/metadata.kt

File renamed without changes.

nmcp/src/main/kotlin/nmcp/internal/task/nmcpFindDeploymentName.kt renamed to nmcp-tasks/src/main/kotlin/nmcp/internal/task/nmcpFindDeploymentName.kt

File renamed without changes.

nmcp/src/main/kotlin/nmcp/internal/task/nmcpPublishFileByFileToMavenLocal.kt renamed to nmcp-tasks/src/main/kotlin/nmcp/internal/task/nmcpPublishFileByFileToMavenLocal.kt

File renamed without changes.

nmcp/src/main/kotlin/nmcp/internal/task/nmcpPublishFileByFileToSnapshots.kt renamed to nmcp-tasks/src/main/kotlin/nmcp/internal/task/nmcpPublishFileByFileToSnapshots.kt

File renamed without changes.

0 commit comments

Comments
 (0)