-
-
Notifications
You must be signed in to change notification settings - Fork 68
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Simon Schubert
committed
Dec 9, 2023
1 parent
d4912e7
commit b9f2edf
Showing
15 changed files
with
65 additions
and
120 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,56 +1,39 @@ | ||
| plugins { | ||
| kotlin("multiplatform") | ||
| application | ||
| kotlin("jvm") | ||
| } | ||
|
|
||
| group = "com.linuxcommandlibrary" | ||
| version = parent!!.version | ||
|
|
||
| dependencies { | ||
| implementation(project(":common")) | ||
| implementation("com.squareup.sqldelight:sqlite-driver:1.5.5") | ||
| } | ||
|
|
||
| kotlin { | ||
| jvm { | ||
| compilations.all { | ||
| kotlinOptions.jvmTarget = "17" | ||
| compilerOptions { | ||
| sourceSets["main"].apply { | ||
| resources.srcDirs("../assets") | ||
| } | ||
| withJava() | ||
| compilations { | ||
| val main = getByName("main") | ||
| tasks { | ||
| register<Jar>("buildJar") { | ||
| group = "application" | ||
| dependsOn(build) | ||
|
|
||
| destinationDirectory.set(file("$projectDir/out")) | ||
| archiveFileName.set("linuxcommandlibrary.jar") | ||
| } | ||
| } | ||
|
|
||
| duplicatesStrategy = DuplicatesStrategy.INCLUDE | ||
| exclude("META-INF/*.RSA", "META-INF/*.SF","META-INF/*.DSA") | ||
| val createJar = tasks.register("createJar", Jar::class) { | ||
| archiveBaseName.set("MyApplication") | ||
| from(sourceSets["main"].output) | ||
|
|
||
| manifest { | ||
| attributes["Main-Class"] = "com.linuxcommandlibrary.desktop.ConsoleApplicationKt" | ||
| } | ||
| from(configurations.getByName("runtimeClasspath").map { if (it.isDirectory) it else zipTree(it) }, main.output.classesDirs) | ||
| archiveBaseName.set("${project.name}-fat2") | ||
| } | ||
| } | ||
| } | ||
| archiveFileName.set("linuxcommandlibrary.jar") | ||
| manifest { | ||
| attributes["Main-Class"] = "com.linuxcommandlibrary.cli.ConsoleApplicationKt" | ||
| } | ||
| from(configurations.getByName("runtimeClasspath").map { if (it.isDirectory) it else zipTree(it) }) | ||
|
|
||
| sourceSets { | ||
| val jvmMain by getting { | ||
| dependencies { | ||
| implementation(project(":common")) | ||
| } | ||
| } | ||
| val jvmTest by getting | ||
| } | ||
| duplicatesStrategy = DuplicatesStrategy.INCLUDE | ||
| exclude("META-INF/*.RSA", "META-INF/*.SF","META-INF/*.DSA") | ||
| } | ||
|
|
||
| tasks.processResources { | ||
| val contents = "version=${version}" | ||
| val file = File("cli/src/jvmMain/resources", "application.properties") | ||
| val file = File("cli/src/main/resources", "application.properties") | ||
| file.writeText(contents) | ||
| } | ||
|
|
||
| application { | ||
| mainClass.set("ConsoleApplicationKt") | ||
| } | ||
| } |
2 changes: 1 addition & 1 deletion
2
...mandlibrary/desktop/ConsoleApplication.kt → ...xcommandlibrary/cli/ConsoleApplication.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,26 +1,22 @@ | ||
| plugins { | ||
| kotlin("multiplatform") | ||
| kotlin("jvm") | ||
| } | ||
|
|
||
| group = "com.linuxcommandlibrary" | ||
| version = "1.0" | ||
|
|
||
| dependencies { | ||
| implementation(project(":common")) | ||
| implementation("org.jetbrains.kotlinx:kotlinx-html-jvm:0.9.1") | ||
| implementation("org.json:json:20231013") | ||
| implementation("com.squareup.sqldelight:sqlite-driver:1.5.5") | ||
| implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3") | ||
| } | ||
|
|
||
| kotlin { | ||
| jvm { | ||
| compilations.all { | ||
| kotlinOptions.jvmTarget = "17" | ||
| } | ||
| withJava() | ||
| } | ||
| sourceSets { | ||
| val jvmMain by getting { | ||
| dependencies { | ||
| implementation(project(":common")) | ||
| implementation("org.jetbrains.kotlinx:kotlinx-html-jvm:0.9.1") | ||
| implementation("org.json:json:20231013") | ||
| } | ||
| compilerOptions { | ||
| sourceSets["main"].apply { | ||
| resources.srcDirs("../assets") | ||
| } | ||
| val jvmTest by getting | ||
| } | ||
| } | ||
|
|
||
| } |
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| 5055 manual pages, 22 basic categories and a bunch of general terminal tips. | ||
| 5547 manual pages, 22 basic categories and a bunch of general terminal tips. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters