Skip to content

Commit 60b5d85

Browse files
committed
General fixes
[skip ci]
1 parent 006e1b1 commit 60b5d85

4 files changed

Lines changed: 6 additions & 5 deletions

File tree

.idea/runConfigurations/Processing.xml

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/build.gradle.kts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ plugins{
1616

1717
group = rootProject.group
1818
version = rootProject.version
19+
val revision = rootProject.findProperty("revision") ?: "1300"
1920

2021
repositories{
2122
mavenCentral()
@@ -40,7 +41,7 @@ compose.desktop {
4041

4142
jvmArgs(*listOf(
4243
Pair("processing.version", version),
43-
Pair("processing.revision", "1300"),
44+
Pair("processing.revision", revision),
4445
Pair("processing.contributions.source", "https://contributions-preview.processing.org/contribs.txt"),
4546
Pair("processing.download.page", "https://processing.org/download/"),
4647
Pair("processing.download.latest", "https://processing.org/download/latest.txt"),
@@ -128,8 +129,9 @@ tasks.register<Exec>("packageCustomDmg"){
128129
dmg.parentFile.mkdirs()
129130

130131
val extra = mutableListOf<String>()
132+
val isSigned = compose.desktop.application.nativeDistributions.macOS.signing.sign.get()
131133

132-
if(!compose.desktop.application.nativeDistributions.macOS.signing.sign.get()) {
134+
if(!isSigned) {
133135
val content = """
134136
run 'xattr -d com.apple.quarantine Processing-${version}.dmg' to remove the quarantine flag
135137
""".trimIndent()

app/windows/Processing.wxs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:ui="http://wixtoolset.org/schemas/v4/wxs/ui">
2-
<Package Name="Processing" Manufacturer="Processing Foundation" Version="$(Version)" UpgradeCode="34577f3b-7cbe-4c5e-827d-5fe5ce9d371c">
2+
<Package Name="Processing" Manufacturer="Processing Foundation" Version="$(Version)" UpgradeCode="89d8d7fe-5602-4b12-ba10-0fe78efbd602">
33
<Icon Id="icon.ico" SourceFile="..\..\build\windows\processing.ico" />
44
<Property Id="ARPPRODUCTICON" Value="icon.ico" />
55

build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
group = project.findProperty("group") ?: "org.processing"
2-
version = project.findProperty("version") ?: "4.4.0"
2+
version = project.findProperty("version") ?: "0.0.0"
33

44
plugins {
55
kotlin("jvm") version libs.versions.kotlin apply false

0 commit comments

Comments
 (0)