Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ jobs:
ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.MAVEN_CENTRAL_USERNAME }}
ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.MAVEN_CENTRAL_PASSWORD }}

ORG_GRADLE_PROJECT_signMavenPackages: true
ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.SIGNING_IN_MEMORY_KEY }}
ORG_GRADLE_PROJECT_signingInMemoryKeyPassword: ${{ secrets.SIGNING_IN_MEMORY_KEY_PASSWORD }}

Expand All @@ -92,6 +93,7 @@ jobs:
GRADLE_PUBLISH_KEY: ${{ secrets.GRADLE_PUBLISH_KEY }}
GRADLE_PUBLISH_SECRET: ${{ secrets.GRADLE_PUBLISH_SECRET }}

ORG_GRADLE_PROJECT_signMavenPackages: true
ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.SIGNING_IN_MEMORY_KEY }}
ORG_GRADLE_PROJECT_signingInMemoryKeyPassword: ${{ secrets.SIGNING_IN_MEMORY_KEY_PASSWORD }}

Expand All @@ -104,6 +106,7 @@ jobs:
GRADLE_PUBLISH_KEY: ${{ secrets.GRADLE_PUBLISH_KEY }}
GRADLE_PUBLISH_SECRET: ${{ secrets.GRADLE_PUBLISH_SECRET }}

ORG_GRADLE_PROJECT_signMavenPackages: true
ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.SIGNING_IN_MEMORY_KEY }}
ORG_GRADLE_PROJECT_signingInMemoryKeyPassword: ${{ secrets.SIGNING_IN_MEMORY_KEY_PASSWORD }}

Expand Down
3 changes: 2 additions & 1 deletion core/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@ dependencies {

mavenPublishing{
publishToMavenCentral(SonatypeHost.CENTRAL_PORTAL, automaticRelease = true)
signAllPublications()
if (project.hasProperty("signMavenPackages"))
signAllPublications()

pom{
name.set("Processing Core")
Expand Down
1 change: 1 addition & 0 deletions java/gradle/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ publishing{
val testGroup = group.toString()
tasks.withType<Test>().configureEach {
systemProperty("project.group", testGroup)
dependsOn(project(":core").tasks.named("publishToMavenLocal"))
}

tasks.register("writeVersion") {
Expand Down
24 changes: 21 additions & 3 deletions java/gradle/src/test/kotlin/ProcessingPluginTest.kt
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,21 @@ class ProcessingPluginTest{
id("${System.getProperty("project.group")}.java")
}
""".trimIndent())
directory.newFile("sketch/settings.gradle.kts")
directory.newFile("sketch/settings.gradle.kts").writeText(
"""
pluginManagement {
repositories {
mavenLocal()
gradlePluginPortal()
}
}
""".trimIndent()
)
directory.newFile("sketch/gradle.properties").writeText(
"""
processing.group=${System.getProperty("project.group").replace(".java", "")}
""".trimIndent()
)
configure(sketchFolder)

val buildResult = GradleRunner.create()
Expand Down Expand Up @@ -218,6 +232,7 @@ class ProcessingPluginTest{
""".trimIndent())
sketchFolder.resolve("gradle.properties").writeText(""")
processing.workingDir = ${sketchFolder.parentFile.absolutePath}
processing.group=${System.getProperty("project.group").replace(".java", "")}
""".trimIndent())
}
val sketchClass = classLoader.loadClass("sketch")
Expand Down Expand Up @@ -250,9 +265,12 @@ class ProcessingPluginTest{
println("Hello World");
}
""".trimIndent())
sketchFolder.resolve("gradle.properties").writeText(""")
sketchFolder.resolve("gradle.properties").writeText(
"""
processing.sketchbook = ${libraryResult.libraryFolder.parentFile.parentFile.absolutePath}
""".trimIndent())
processing.group=${System.getProperty("project.group").replace(".java", "")}
""".trimIndent()
)
}

val sketchClass = classLoader.loadClass("sketch")
Expand Down
3 changes: 2 additions & 1 deletion java/libraries/dxf/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@ sourceSets {

mavenPublishing {
publishToMavenCentral(com.vanniktech.maven.publish.SonatypeHost.CENTRAL_PORTAL, automaticRelease = true)
signAllPublications()
if (project.hasProperty("signing.signMavenPackages"))
signAllPublications()
coordinates("$group.core", name, version.toString())

pom {
Expand Down
3 changes: 2 additions & 1 deletion java/libraries/io/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,8 @@ mavenPublishing {
coordinates("$group.core", name, version.toString())
publishToMavenCentral(SonatypeHost.CENTRAL_PORTAL, automaticRelease = true)

signAllPublications()
if (project.hasProperty("signMavenPackages"))
signAllPublications()

pom {
name.set("Processing IO")
Expand Down
3 changes: 2 additions & 1 deletion java/libraries/net/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,8 @@ mavenPublishing {
coordinates("$group.core", name, version.toString())
publishToMavenCentral(SonatypeHost.CENTRAL_PORTAL, automaticRelease = true)

signAllPublications()
if (project.hasProperty("signMavenPackages"))
signAllPublications()

pom {
name.set("Processing Net")
Expand Down
3 changes: 2 additions & 1 deletion java/libraries/pdf/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,8 @@ mavenPublishing{
coordinates("$group.core", name, version.toString())
publishToMavenCentral(SonatypeHost.CENTRAL_PORTAL, automaticRelease = true)

signAllPublications()
if (project.hasProperty("signMavenPackages"))
signAllPublications()

pom{
name.set("Processing PDF")
Expand Down
3 changes: 2 additions & 1 deletion java/libraries/serial/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,8 @@ mavenPublishing {
coordinates("$group.core", name, version.toString())
publishToMavenCentral(SonatypeHost.CENTRAL_PORTAL, automaticRelease = true)

signAllPublications()
if (project.hasProperty("signMavenPackages"))
signAllPublications()

pom {
name.set("Processing Serial")
Expand Down
3 changes: 2 additions & 1 deletion java/libraries/svg/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,8 @@ mavenPublishing {
coordinates("$group.core", name, version.toString())
publishToMavenCentral(SonatypeHost.CENTRAL_PORTAL, automaticRelease = true)

signAllPublications()
if (project.hasProperty("signMavenPackages"))
signAllPublications()

pom {
name.set("Processing SVG")
Expand Down
2 changes: 1 addition & 1 deletion java/preprocessor/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ mavenPublishing{
publishToMavenCentral(SonatypeHost.CENTRAL_PORTAL, automaticRelease = true)

// Only sign if signing is set up
if(project.hasProperty("signing.keyId") || project.hasProperty("signingInMemoryKey"))
if (project.hasProperty("signing.signMavenPackages"))
signAllPublications()

pom{
Expand Down
Loading