Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .run/webExample.run.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
</option>
<option name="taskNames">
<list>
<option value="jsBrowserRun" />
<option value="jsBrowserDevelopmentRun" />
</list>
</option>
<option name="vmOptions" />
Expand Down
17 changes: 11 additions & 6 deletions androidExample/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import org.jetbrains.kotlin.gradle.dsl.JvmTarget

@Suppress("DSL_SCOPE_VIOLATION")
plugins {
id(libs.plugins.android.application.get().pluginId)
Expand All @@ -9,7 +11,7 @@ plugins {

android {
namespace = "dev.snipme.androidexample"
compileSdk = 34
compileSdk = 35

defaultConfig {
minSdk = 25
Expand All @@ -35,18 +37,21 @@ android {
}

compileOptions {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}
kotlinOptions {
jvmTarget = libs.versions.jvmTarget.get()
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
}

composeOptions {
kotlinCompilerExtensionVersion = libs.versions.kotlinCompilerExtensionVersion.get()
}
}

tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
compilerOptions {
jvmTarget.set(JvmTarget.JVM_11)
}
}

dependencies {
// Core
implementation(libs.core.ktx)
Expand Down
12 changes: 6 additions & 6 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,19 @@
activityCompose = "1.9.2"
appcompat = "1.7.0"
coreKtx = "1.13.1"
jvmTarget = "1.8"
jvmTarget = "11"
gradlePlugin = "8.1.0"

kotlin = "2.0.20"
kotlin = "2.2.20"
ksp = "1.8.10-1.0.9"
kotlinCompilerExtensionVersion = "1.5.3"

kotlinAndroid = "2.0.20"
kotlinMultiplatform = "2.0.20"
compose = "1.6.11"
kotlinAndroid = "2.2.20"
kotlinMultiplatform = "2.2.20"
compose = "1.9.0"
androidLibrary = "8.6.1"
kodeview = "0.8.0"
highlights = "1.0.0"
highlights = "1.1.0"
composeMaterial = "1.4.0"

[libraries]
Expand Down
10 changes: 7 additions & 3 deletions kodeview/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import org.jetbrains.kotlin.gradle.dsl.JvmTarget

@Suppress("DSL_SCOPE_VIOLATION")
plugins {
alias(libs.plugins.multiplatform)
Expand All @@ -13,7 +15,7 @@ version = "0.9.0"

android {
namespace = "dev.snipme.kodeview"
compileSdk = 34
compileSdk = 35

defaultConfig {
minSdk = 25
Expand All @@ -32,8 +34,10 @@ kotlin {

androidTarget {
compilations.all {
kotlinOptions {
jvmTarget = libs.versions.jvmTarget.get()
compileTaskProvider.configure {
compilerOptions {
jvmTarget.set(JvmTarget.fromTarget(libs.versions.jvmTarget.get()))
}
}
}
}
Expand Down
Loading