Skip to content

Commit db57000

Browse files
MrBoomDeveloperMrBoomDeveloper
committed
Updated libraries,
Something related to routing, Correctly specify java and android version in build scripts
1 parent 48f021d commit db57000

File tree

19 files changed

+163
-105
lines changed

19 files changed

+163
-105
lines changed

‎app/build.gradle.kts‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,14 @@ fun getLocales(): Collection<String> {
2424
}
2525

2626
kotlin {
27+
jvmToolchain(properties["awery.java.desktop"].toString().toInt())
2728
jvm("desktop")
2829

2930
androidTarget {
3031
compilations.all {
3132
compileTaskProvider.configure {
3233
compilerOptions {
33-
jvmTarget = JvmTarget.JVM_11
34+
jvmTarget = JvmTarget.fromTarget(properties["awery.java.android"].toString())
3435
}
3536
}
3637
}
@@ -112,13 +113,13 @@ kotlin {
112113

113114
android {
114115
namespace = "com.mrboomdev.awery"
115-
compileSdk = property("awery.sdk.target").toString().toInt()
116+
compileSdk = properties["awery.sdk.target"].toString().toInt()
116117

117118
defaultConfig {
118-
versionName = property("awery.app.versionName").toString()
119-
versionCode = property("awery.app.versionCode").toString().toInt()
120-
targetSdk = property("awery.sdk.target").toString().toInt()
121-
minSdk = property("awery.sdk.min").toString().toInt()
119+
versionName = properties["awery.app.versionName"].toString()
120+
versionCode = properties["awery.app.versionCode"].toString().toInt()
121+
targetSdk = properties["awery.sdk.target"].toString().toInt()
122+
minSdk = properties["awery.sdk.min"].toString().toInt()
122123
}
123124

124125
buildTypes {
@@ -202,8 +203,8 @@ enum class DesktopTarget(
202203

203204
DesktopTarget.values().map { target ->
204205
target to tasks.register(listOf("download", target.os, target.arch, "jre").joinToCamelCase()) {
205-
val version = property("awery.jre.version").toString()
206-
val variant = property("awery.jre.variant").toString()
206+
val version = properties["awery.jre.version"].toString()
207+
val variant = properties["awery.jre.variant"].toString()
207208

208209
inputs.property("jreVersion", version)
209210
inputs.property("jreVariant", variant)
@@ -226,7 +227,7 @@ compose.desktop {
226227
nativeDistributions {
227228
targetFormats = DesktopTarget.values().map { it.targetFormat }.toSet()
228229
packageName = "Awery"
229-
packageVersion = property("awery.app.versionName").toString()
230+
packageVersion = properties["awery.app.versionName"].toString()
230231
includeAllModules = true
231232

232233
windows {

‎app/src/desktopMain/kotlin/com/mrboomdev/awery/app/Main.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@ import com.formdev.flatlaf.intellijthemes.FlatOneDarkIJTheme
3838
import com.mrboomdev.awery.core.Awery
3939
import com.mrboomdev.awery.resources.*
4040
import com.mrboomdev.awery.ui.App
41-
import com.mrboomdev.awery.ui.navigation.NavigationState
42-
import com.mrboomdev.awery.ui.navigation.Routes
4341
import com.mrboomdev.awery.ui.components.ContextMenu
4442
import com.mrboomdev.awery.ui.components.IconButton
43+
import com.mrboomdev.awery.ui.navigation.NavigationState
44+
import com.mrboomdev.awery.ui.navigation.Routes
4545
import com.mrboomdev.awery.ui.theme.AweryTheme
4646
import com.mrboomdev.awery.ui.theme.aweryColorScheme
4747
import com.mrboomdev.awery.ui.utils.WindowSizeType
@@ -97,7 +97,7 @@ fun main() {
9797
IntUiTheme(
9898
theme = JewelTheme.darkThemeDefinition(
9999
colors = GlobalColors.dark(
100-
paneBackground = colorScheme.background
100+
panelBackground = colorScheme.background
101101
),
102102

103103
disabledAppearanceValues = DisabledAppearanceValues.dark()

‎core/build.gradle.kts‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,28 @@
11
import com.android.build.api.dsl.androidLibrary
2+
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
23

34
plugins {
45
alias(libs.plugins.kotlin.multiplatform)
56
alias(androidLibs.plugins.library)
67
}
78

89
kotlin {
10+
jvmToolchain(properties["awery.java.desktop"].toString().toInt())
911
jvm("desktop")
1012

1113
@Suppress("UnstableApiUsage")
1214
androidLibrary {
1315
namespace = "com.mrboomdev.awery.core"
14-
compileSdk = 35
15-
minSdk = 25
16+
compileSdk = properties["awery.sdk.target"].toString().toInt()
17+
minSdk = properties["awery.sdk.min"].toString().toInt()
18+
19+
compilations.all {
20+
compileTaskProvider.configure {
21+
compilerOptions {
22+
jvmTarget = JvmTarget.fromTarget(properties["awery.java.android"].toString())
23+
}
24+
}
25+
}
1626
}
1727

1828
compilerOptions {

‎data/build.gradle.kts‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import com.android.build.api.dsl.androidLibrary
22
import com.codingfeline.buildkonfig.compiler.FieldSpec
33
import com.codingfeline.buildkonfig.gradle.TargetConfigDsl
4+
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
45

56
plugins {
67
alias(libs.plugins.kotlin.multiplatform)
@@ -17,13 +18,22 @@ room {
1718
}
1819

1920
kotlin {
21+
jvmToolchain(properties["awery.java.desktop"].toString().toInt())
2022
jvm("desktop")
2123

2224
@Suppress("UnstableApiUsage")
2325
androidLibrary {
2426
namespace = "com.mrboomdev.awery.data"
25-
compileSdk = 35
26-
minSdk = 25
27+
compileSdk = properties["awery.sdk.target"].toString().toInt()
28+
minSdk = properties["awery.sdk.min"].toString().toInt()
29+
30+
compilations.all {
31+
compileTaskProvider.configure {
32+
compilerOptions {
33+
jvmTarget = JvmTarget.fromTarget(properties["awery.java.android"].toString())
34+
}
35+
}
36+
}
2737
}
2838

2939
sourceSets {

‎data/src/desktopMain/kotlin/com/mrboomdev/awery/data/database/AweryHistoryDatabase.desktop.kt‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
package com.mrboomdev.awery.data.database
2+
3+
import androidx.room.Room
4+
import androidx.room.RoomDatabase
5+
import io.github.vinceglb.filekit.FileKit
6+
import io.github.vinceglb.filekit.absolutePath
7+
import io.github.vinceglb.filekit.databasesDir
8+
import io.github.vinceglb.filekit.resolve
9+
10+
internal actual fun createHistoryDatabase(
11+
block: RoomDatabase.Builder<AweryHistoryDatabase>.() -> Unit
12+
) = Room.databaseBuilder<AweryHistoryDatabase>(
13+
name = FileKit.databasesDir.resolve("history.db").absolutePath()
14+
).apply(block).build()

‎extension/bundled/build.gradle.kts‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import com.android.build.api.dsl.androidLibrary
2+
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
23

34
plugins {
45
alias(libs.plugins.kotlin.multiplatform)
@@ -7,13 +8,22 @@ plugins {
78
}
89

910
kotlin {
11+
jvmToolchain(properties["awery.java.desktop"].toString().toInt())
1012
jvm("desktop")
1113

1214
@Suppress("UnstableApiUsage")
1315
androidLibrary {
1416
namespace = "com.mrboomdev.awery.extension.bundled"
15-
compileSdk = 35
16-
minSdk = 25
17+
compileSdk = properties["awery.sdk.target"].toString().toInt()
18+
minSdk = properties["awery.sdk.min"].toString().toInt()
19+
20+
compilations.all {
21+
compileTaskProvider.configure {
22+
compilerOptions {
23+
jvmTarget = JvmTarget.fromTarget(properties["awery.java.android"].toString())
24+
}
25+
}
26+
}
1727
}
1828

1929
compilerOptions {

‎extension/loaders/android-compat/build.gradle.kts‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,28 @@
11
import com.android.build.api.dsl.androidLibrary
2+
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
23

34
plugins {
45
alias(libs.plugins.kotlin.multiplatform)
56
alias(androidLibs.plugins.library)
67
}
78

89
kotlin {
10+
jvmToolchain(properties["awery.java.desktop"].toString().toInt())
911
jvm("desktop")
1012

1113
@Suppress("UnstableApiUsage")
1214
androidLibrary {
1315
namespace = "com.mrboomdev.awery.extension.loaders.androidcompat"
14-
compileSdk = 35
15-
minSdk = 25
16+
compileSdk = properties["awery.sdk.target"].toString().toInt()
17+
minSdk = properties["awery.sdk.min"].toString().toInt()
18+
19+
compilations.all {
20+
compileTaskProvider.configure {
21+
compilerOptions {
22+
jvmTarget = JvmTarget.fromTarget(properties["awery.java.android"].toString())
23+
}
24+
}
25+
}
1626
}
1727

1828
compilerOptions {

‎extension/loaders/build.gradle.kts‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import com.android.build.api.dsl.androidLibrary
2+
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
23

34
plugins {
45
alias(libs.plugins.kotlin.multiplatform)
@@ -7,13 +8,22 @@ plugins {
78
}
89

910
kotlin {
11+
jvmToolchain(properties["awery.java.desktop"].toString().toInt())
1012
jvm("desktop")
1113

1214
@Suppress("UnstableApiUsage")
1315
androidLibrary {
1416
namespace = "com.mrboomdev.awery.extension.loaders"
15-
compileSdk = 35
16-
minSdk = 25
17+
compileSdk = properties["awery.sdk.target"].toString().toInt()
18+
minSdk = properties["awery.sdk.min"].toString().toInt()
19+
20+
compilations.all {
21+
compileTaskProvider.configure {
22+
compilerOptions {
23+
jvmTarget = JvmTarget.fromTarget(properties["awery.java.android"].toString())
24+
}
25+
}
26+
}
1727
}
1828

1929
compilerOptions {

‎extension/sdk/build.gradle.kts‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import com.android.build.api.dsl.androidLibrary
2+
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
23

34
plugins {
45
alias(libs.plugins.kotlin.multiplatform)
@@ -8,13 +9,22 @@ plugins {
89
}
910

1011
kotlin {
12+
jvmToolchain(properties["awery.java.desktop"].toString().toInt())
1113
jvm("desktop")
1214

1315
@Suppress("UnstableApiUsage")
1416
androidLibrary {
1517
namespace = "com.mrboomdev.awery.extension.sdk"
16-
compileSdk = 35
17-
minSdk = 25
18+
compileSdk = properties["awery.sdk.target"].toString().toInt()
19+
minSdk = properties["awery.sdk.min"].toString().toInt()
20+
21+
compilations.all {
22+
compileTaskProvider.configure {
23+
compilerOptions {
24+
jvmTarget = JvmTarget.fromTarget(properties["awery.java.android"].toString())
25+
}
26+
}
27+
}
1828
}
1929

2030
compilerOptions {

‎gradle.properties‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ awery.app.versionName=2.0.1
88
awery.app.versionCode=2
99
awery.sdk.min=25
1010
awery.sdk.target=36
11+
awery.java.android=11
12+
awery.java.desktop=21
1113
awery.jre.version=21.0.8b1138.52
1214
awery.jre.variant=jbrsdk
1315

0 commit comments

Comments
 (0)