Skip to content

Commit 4686345

Browse files
authored
Merge branch 'welcome-screen' into compose-windows
2 parents db69773 + 77eba30 commit 4686345

21 files changed

+700
-521
lines changed

app/build.gradle.kts

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ plugins{
1717

1818
alias(libs.plugins.compose.compiler)
1919
alias(libs.plugins.jetbrainsCompose)
20+
2021
alias(libs.plugins.serialization)
2122
alias(libs.plugins.download)
2223
}
@@ -60,7 +61,7 @@ compose.desktop {
6061
).map { "-D${it.first}=${it.second}" }.toTypedArray())
6162

6263
nativeDistributions{
63-
modules("jdk.jdi", "java.compiler", "jdk.accessibility", "java.management.rmi", "java.scripting", "jdk.httpserver")
64+
modules("jdk.jdi", "java.compiler", "jdk.accessibility", "jdk.zipfs", "java.management.rmi", "java.scripting", "jdk.httpserver")
6465
targetFormats(TargetFormat.Dmg, TargetFormat.Msi, TargetFormat.Deb)
6566
packageName = "Processing"
6667

@@ -108,27 +109,29 @@ dependencies {
108109

109110
implementation(compose.runtime)
110111
implementation(compose.foundation)
111-
implementation(compose.material)
112112
implementation(compose.ui)
113113
implementation(compose.components.resources)
114114
implementation(compose.components.uiToolingPreview)
115+
implementation(compose.materialIconsExtended)
115116

116117
implementation(compose.desktop.currentOs)
118+
implementation(libs.material3)
117119

118120
implementation(libs.compottie)
119121
implementation(libs.kaml)
120122
implementation(libs.markdown)
121123
implementation(libs.markdownJVM)
122124

125+
implementation(libs.clikt)
126+
implementation(libs.kotlinxSerializationJson)
127+
123128
@OptIn(ExperimentalComposeLibrary::class)
124129
testImplementation(compose.uiTest)
125130
testImplementation(kotlin("test"))
126131
testImplementation(libs.mockitoKotlin)
127132
testImplementation(libs.junitJupiter)
128133
testImplementation(libs.junitJupiterParams)
129-
130-
implementation(libs.clikt)
131-
implementation(libs.kotlinxSerializationJson)
134+
132135
}
133136

134137
tasks.test {

app/src/processing/app/contrib/ui/ContributionManager.kt

Lines changed: 0 additions & 310 deletions
This file was deleted.

0 commit comments

Comments
 (0)