Skip to content

Commit 20eb867

Browse files
committed
Add conflict resolver
1 parent bc34904 commit 20eb867

File tree

14 files changed

+445
-30
lines changed

14 files changed

+445
-30
lines changed

.idea/compiler.xml

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

.idea/inspectionProfiles/Project_Default.xml

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

.idea/jarRepositories.xml

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

.idea/kotlinc.xml

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

.idea/misc.xml

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

.idea/workspace.xml

Lines changed: 48 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

build.gradle.kts

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,19 @@ plugins {
1212
group = "com.likco"
1313
version = "1.0"
1414

15+
val spaceUsername: String by project
16+
val spacePassword: String by project
17+
1518
repositories {
1619
mavenCentral()
1720
maven { url = uri("https://jitpack.io") }
21+
maven {
22+
url = uri("https://maven.pkg.jetbrains.space/likco/p/dbhelper/maven")
23+
credentials {
24+
username = spaceUsername
25+
password = spacePassword
26+
}
27+
}
1828
}
1929

2030
dependencies {
@@ -34,7 +44,7 @@ dependencies {
3444

3545
implementation("it.sauronsoftware:junique:1.0.4")
3646

37-
implementation("com.github.LikCoD:DBHelper:v0.6.1")
47+
implementation("liklibs.db:db-helper:0.9.2")
3848

3949
implementation(kotlin("stdlib-jdk8"))
4050
testImplementation(kotlin("reflect"))
@@ -43,8 +53,8 @@ dependencies {
4353
}
4454

4555
javafx {
46-
modules = mutableListOf("javafx.controls", "javafx.fxml")
47-
version = "15.0.1"
56+
modules = listOf("javafx.controls", "javafx.fxml")
57+
version = "17.0.2"
4858
}
4959

5060
tasks.test {
@@ -64,12 +74,12 @@ tasks.compileJava {
6474
options.isFork = true
6575
options.isFailOnError = false
6676

67-
options.release.set(8)
77+
options.release.set(16)
6878
}
6979

7080
java {
7181
toolchain {
72-
languageVersion.set(JavaLanguageVersion.of(8))
82+
languageVersion.set(JavaLanguageVersion.of(16))
7383
}
7484
}
7585

@@ -91,4 +101,4 @@ tasks.jar {
91101
from({
92102
configurations.runtimeClasspath.get().filter { it.name.endsWith("jar") }.map { zipTree(it) }
93103
})
94-
}
104+
}

gradle.properties

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
kotlin.code.style=official
2-
username=LikDan
3-
password=eyJhbGciOiJSUzUxMiJ9.eyJzdWIiOiIxbGNpZ0wwaExRYzUiLCJhdWQiOiJjaXJjbGV0LXdlYi11aSIsIm9yZ0RvbWFpbiI6Imxpa2RhbiIsIm5hbWUiOiJMaWtEYW4iLCJpc3MiOiJodHRwczpcL1wvamV0YnJhaW5zLnNwYWNlIiwicGVybV90b2tlbiI6IjJIZktTbzFVNHZSayIsInByaW5jaXBhbF90eXBlIjoiVVNFUiIsImlhdCI6MTYxNzkwMDA0Mn0.oec0fgQ1_tNVXpRcPonumOiH0I749TXKUTN1jbiXQjVrmZ1cd_vdjswzqYxIgi6C3Ug2OlYFrPfBdpJWes21k83XaVU1JIrF-yIQtEluonUaMRqYDuEIFbt-a__R8WRetKdnMWOkSkz38fzffLR4ycG0ShXWnTvbd1P-nMd_Nao
2+
3+
spaceUsername = likdan
4+
spacePassword = eyJhbGciOiJSUzUxMiJ9.eyJzdWIiOiJhMERsbDJHTHJ4byIsImF1ZCI6ImNpcmNsZXQtd2ViLXVpIiwib3JnRG9tYWluIjoibGlrY28iLCJuYW1lIjoibGlrZGFuIiwiaXNzIjoiaHR0cHM6XC9cL2xpa2NvLmpldGJyYWlucy5zcGFjZSIsInBlcm1fdG9rZW4iOiIyVjUxTlkyV093a0kiLCJwcmluY2lwYWxfdHlwZSI6IlVTRVIiLCJpYXQiOjE2NDgzMTMzMjl9.GQRMK4zFjCb1O8UxRhndXSyezWoXt4xIL3bdclI4ACO2eVolWwE_N_i_QcArEQnWZAMKhhRsfwzde3_RJTdAk4eWcLlMBJTYnp2m0dK9fCutexdqFPgxyfDV0oavF7zWqfFP5OXfPkDYThAdeSNGCH_Pm0cr_1XZaMhrbL8cgxk

src/main/kotlin/ldcapps/servicehelper/Launcher.kt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@ import kotlin.system.exitProcess
1414
class MApp: App(LoadingView::class, MainStyle::class){
1515
override fun start(stage: Stage) {
1616
stage.minWidth = 400.0
17+
stage.width = 400.0
18+
19+
stage.minHeight = 50.0
1720
super.start(stage)
1821

1922
open(parameters.raw.firstOrNull(), stage)
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
package ldcapps.servicehelper
2+
3+
annotation class Name(val name: String)

0 commit comments

Comments
 (0)