Skip to content

Commit

Permalink
Bump.
Browse files Browse the repository at this point in the history
  • Loading branch information
gyakkun committed Oct 11, 2023
1 parent 263ee76 commit d80de0a
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 10 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ build/
.idea/jarRepositories.xml
.idea/compiler.xml
.idea/libraries/
.idea/artifacts/*
*.iws
*.iml
*.ipr
Expand Down
19 changes: 14 additions & 5 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import org.gradle.process.internal.JvmOptions
import org.jetbrains.compose.desktop.application.dsl.TargetFormat

plugins {
Expand All @@ -14,9 +15,16 @@ repositories {
maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
}


//java {
// sourceCompatibility = JavaVersion.VERSION_20
// targetCompatibility = JavaVersion.VERSION_20
// }

kotlin {
jvm {
compilations.all {
// kotlinOptions.jvmTarget = "20"
kotlinOptions.jvmTarget = "17"
}
withJava()
Expand All @@ -27,12 +35,13 @@ kotlin {
implementation(compose.desktop.currentOs)
implementation("org.apache.commons:commons-imaging:1.0-alpha3")
implementation("commons-codec:commons-codec:1.15")
implementation("org.apache.commons:commons-lang3:3.12.0")
implementation("org.apache.commons:commons-text:1.10.0")


// Loggin
implementation("org.slf4j:slf4j-api:2.0.7")
implementation("org.slf4j:jul-to-slf4j:2.0.7")
implementation("ch.qos.logback:logback-classic:1.4.7")
// Logging
implementation("org.slf4j:slf4j-api:2.0.9")
implementation("org.slf4j:jul-to-slf4j:2.0.9")
implementation("ch.qos.logback:logback-classic:1.4.11")
}
}
val jvmTest by getting
Expand Down
6 changes: 3 additions & 3 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
kotlin.code.style=official
kotlin.version=1.8.20
compose.version=1.4.0
app.version=1.2.4
kotlin.version=1.9.10
compose.version=1.5.3
app.version=1.2.5
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
2 changes: 1 addition & 1 deletion src/jvmMain/kotlin/Mht2Html.kt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import kotlinx.coroutines.channels.ReceiveChannel
import kotlinx.coroutines.channels.produce
import org.apache.commons.codec.binary.Base64
import org.apache.commons.imaging.Imaging
import org.apache.commons.lang3.StringEscapeUtils
import org.apache.commons.text.StringEscapeUtils
import org.slf4j.LoggerFactory
import java.io.*
import java.nio.charset.Charset
Expand Down

0 comments on commit d80de0a

Please sign in to comment.