Skip to content

Commit 4c6e6b3

Browse files
FrottyFrotty
committed
slim down artifact
1 parent c8a24bf commit 4c6e6b3

19 files changed

Lines changed: 68 additions & 45 deletions

‎build.gradle‎

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -39,19 +39,16 @@ repositories {
3939
}
4040

4141
dependencies {
42-
implementation group: 'us.monoid.web', name: 'resty', version: '0.3.2'
43-
implementation group: 'org.eclipse.jgit', name: 'org.eclipse.jgit', version: '6.9.0.202403050737-r'
44-
implementation group: 'org.eclipse.jgit', name: 'org.eclipse.jgit.ssh.apache', version: '6.9.0.202403050737-r'
45-
implementation 'com.fasterxml.jackson.core:jackson-databind:2.20.0'
46-
implementation 'com.fasterxml.jackson.module:jackson-module-kotlin:2.20.0'
47-
implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.20.0'
42+
implementation platform('com.fasterxml.jackson:jackson-bom:2.21.2')
43+
implementation group: 'org.eclipse.jgit', name: 'org.eclipse.jgit', version: '7.6.0.202603022253-r'
44+
implementation 'com.fasterxml.jackson.core:jackson-databind'
45+
implementation 'com.fasterxml.jackson.module:jackson-module-kotlin'
46+
implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml'
4847
implementation 'com.github.frotty:SwingDarkFlatTable:1d9ae26e69'
49-
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
50-
implementation 'io.github.microutils:kotlin-logging:3.0.5'
5148
implementation 'com.github.Frotty:SimpleRegistry:f96dda96bd'
52-
implementation group: 'org.slf4j', name: 'slf4j-api', version: '1.7.32'
53-
implementation group: 'ch.qos.logback', name: 'logback-classic', version: '1.5.13'
54-
testImplementation 'org.testng:testng:7.8.0'
49+
implementation group: 'org.slf4j', name: 'slf4j-api', version: '2.0.17'
50+
implementation group: 'ch.qos.logback', name: 'logback-classic', version: '1.5.32'
51+
testImplementation 'org.testng:testng:7.12.0'
5552
}
5653

5754
test {
@@ -70,7 +67,7 @@ configurations.all {
7067
}
7168

7269
buildscript {
73-
ext.kotlin_version = '2.3.0'
70+
ext.kotlin_version = '2.3.21'
7471
repositories {
7572
flatDir dirs: 'src/main/resources/'
7673
mavenCentral()
@@ -169,5 +166,3 @@ compileTestKotlin {
169166
jvmTarget = "25"
170167
}
171168
}
172-
173-

‎src/main/kotlin/config/WurstProjectConfig.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import com.fasterxml.jackson.databind.node.ObjectNode
1111
import file.*
1212
import global.InstallationManager
1313
import global.Log
14-
import mu.KotlinLogging
14+
import logging.KotlinLogging
1515
import ui.UiManager
1616
import java.io.IOException
1717
import java.nio.file.Files

‎src/main/kotlin/file/DependencyManager.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package file
22

33
import config.WurstProjectConfigData
44
import global.Log
5-
import mu.KotlinLogging
5+
import logging.KotlinLogging
66
import org.eclipse.jgit.api.CreateBranchCommand
77
import org.eclipse.jgit.api.Git
88
import org.eclipse.jgit.api.ResetCommand

‎src/main/kotlin/file/Download.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package file
33
import global.Log
44

55

6-
import mu.KotlinLogging
6+
import logging.KotlinLogging
77
import ui.MainWindow
88
import workers.DownloadWithProgressWorker
99
import java.io.BufferedInputStream

‎src/main/kotlin/file/FileUtils.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package file
22

3-
import mu.KotlinLogging
3+
import logging.KotlinLogging
44
import java.nio.file.Files
55
import java.nio.file.Path
66
import java.nio.file.StandardCopyOption

‎src/main/kotlin/file/SetupApp.kt‎

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import config.WurstProjectConfig
55
import config.WurstProjectConfigData
66
import global.InstallationManager
77
import global.Log
8-
import mu.KotlinLogging
8+
import logging.KotlinLogging
99
import net.ConnectionManager
1010
import net.NetStatus
1111
import org.eclipse.jgit.api.Git
@@ -67,7 +67,16 @@ object SetupApp {
6767

6868
when {
6969
setup.command == CLICommand.HELP -> {
70-
log.info("Use one of the following commands: ${CLICommand.values().joinToString(", ")}")
70+
log.info("""
71+
|Available commands:
72+
| install [dep|wurstscript|grill] Install/update dependencies, WurstScript compiler, or grill itself
73+
| remove [dep|wurstscript] Remove a dependency or uninstall WurstScript
74+
| generate <name> Generate a new Wurst project in a subfolder
75+
| test [filter] Run unit tests, optionally filtered by package/function name
76+
| typecheck Typecheck the project without building a map
77+
| outdated Check whether project dependencies are up to date
78+
| build <mapfile> Build the project using the given input map
79+
""".trimMargin())
7180
}
7281
setup.command == CLICommand.INSTALL -> {
7382
if (setup.commandArg.isBlank()) {
@@ -110,7 +119,7 @@ object SetupApp {
110119
}
111120
}
112121
setup.command == CLICommand.TYPECHECK -> {
113-
log.info("Typechecking project..")
122+
log.info("🔍 Typechecking project..")
114123
if (InstallationManager.status != InstallationManager.InstallationStatus.NOT_INSTALLED && configData != null) {
115124
typecheckProject(configData)
116125
}
@@ -191,6 +200,10 @@ object SetupApp {
191200
val args = commonArgs(configData)
192201

193202
args.add("-runtests")
203+
if (setup.commandArg.isNotBlank()) {
204+
args.add("-testFilter")
205+
args.add(setup.commandArg.removeSuffix(".wurst"))
206+
}
194207

195208
val result = startWurstProcess(args)
196209
when (result) {
@@ -211,9 +224,9 @@ object SetupApp {
211224

212225
val result = startWurstProcess(args)
213226
when (result) {
214-
0 -> log.info("Typecheck succeeded.")
227+
0 -> log.info("✔ Typecheck succeeded.")
215228
else -> {
216-
log.info("Typecheck failed.")
229+
log.info("❌ Typecheck failed.")
217230
ExitHandler.exit(1)
218231
}
219232
}
@@ -299,12 +312,12 @@ object SetupApp {
299312
WurstProjectConfig.handleUpdate(setup.projectRoot, null, configData)
300313
}
301314

302-
val REPO_REGEX = Regex("((git@|http(s)?://)([\\w.@]+)([/:]))([\\w,\\-,_]+)/([\\w,\\-,_]+)(.git)?((/)?)")
315+
val REPO_REGEX = Regex("(https?://)([\\w.@-]+)(/)([\\w,-_]+)/([\\w,-_]+)(.git)?((/)?)")
303316

304317
private fun handleInstallDep(configData: WurstProjectConfigData) {
305318
val resolvedName = DependencyManager.resolveName(setup.commandArg)
306319
if (!REPO_REGEX.matches(resolvedName.first)) {
307-
log.info("<${setup.commandArg}> does not appear to be a valid git repo link (e.g. https://github.com/user/repo)")
320+
log.info("<${setup.commandArg}> does not appear to be a supported git repo link (e.g. https://github.com/user/repo). SSH repo URLs are not bundled in the slim CLI.")
308321
ExitHandler.exit(1)
309322
}
310323
log.info("🔹 Installing ${resolvedName.second}")

‎src/main/kotlin/file/SetupMain.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package file
22

3-
import mu.KotlinLogging
3+
import logging.KotlinLogging
44
import java.nio.file.Files
55
import java.nio.file.Path
66
import kotlin.jvm.Throws

‎src/main/kotlin/file/YamlHelper.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import com.fasterxml.jackson.dataformat.yaml.YAMLFactory
99
import com.fasterxml.jackson.dataformat.yaml.YAMLGenerator
1010
import com.fasterxml.jackson.module.kotlin.KotlinModule
1111
import config.WurstProjectConfigData
12-
import mu.KotlinLogging
12+
import logging.KotlinLogging
1313
import java.io.IOException
1414
import java.nio.file.Files
1515
import java.nio.file.Path

‎src/main/kotlin/file/ZipArchiveExtractor.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package file
22

33

44
import global.Log
5-
import mu.KotlinLogging
5+
import logging.KotlinLogging
66
import java.io.*
77
import java.nio.file.Files
88
import java.nio.file.Path

‎src/main/kotlin/global/CLIParser.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package global
22

33
import file.SetupApp
4-
import mu.KotlinLogging
4+
import logging.KotlinLogging
55
import ui.ErrorDialog
66
import java.util.concurrent.TimeUnit
77

0 commit comments

Comments
 (0)