Skip to content

Commit bbe087e

Browse files
committed
fix(build): multiple build system fixes
1 parent b3be2fd commit bbe087e

File tree

4 files changed

+30
-6
lines changed

4 files changed

+30
-6
lines changed

app/build.gradle.kts

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
2+
13
plugins {
24
alias(libs.plugins.android.application)
35
alias(libs.plugins.kotlin.android)
@@ -20,6 +22,7 @@ android {
2022
cppFlags += ""
2123
}
2224
}
25+
2326
ndk {
2427
abiFilters += listOf("arm64-v8a", "x86_64")
2528
}
@@ -37,13 +40,18 @@ android {
3740
signingConfig = signingConfigs.getByName("debug")
3841
}
3942
}
43+
4044
compileOptions {
41-
sourceCompatibility = JavaVersion.VERSION_11
42-
targetCompatibility = JavaVersion.VERSION_11
45+
sourceCompatibility = JavaVersion.VERSION_23
46+
targetCompatibility = JavaVersion.VERSION_23
4347
}
44-
kotlinOptions {
45-
jvmTarget = "11"
48+
49+
kotlin {
50+
compilerOptions {
51+
jvmTarget.set(JvmTarget.JVM_23)
52+
}
4653
}
54+
4755
buildFeatures {
4856
compose = true
4957
}

app/src/main/cpp/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55

66
file(
77
DOWNLOAD
8-
https://github.com/cpm-cmake/CPM.cmake/releases/download/v0.42.0/CPM.cmake
8+
https://github.com/cpm-cmake/CPM.cmake/releases/download/v0.42.1/CPM.cmake
99
${CMAKE_CURRENT_BINARY_DIR}/cmake/CPM.cmake
10-
EXPECTED_HASH SHA256=2020b4fc42dba44817983e06342e682ecfc3d2f484a581f11cc5731fbe4dce8a
10+
EXPECTED_HASH SHA256=f3a6dcc6a04ce9e7f51a127307fa4f699fb2bade357a8eb4c5b45df76e1dc6a5
1111
)
1212

1313
include(${CMAKE_CURRENT_BINARY_DIR}/cmake/CPM.cmake)
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
#This file is generated by updateDaemonJvm
2+
toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/29ee363f71d060405f729a8f1b7f7aef/redirect
3+
toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/67a0fee3c4236b6397dcbe8575ca2011/redirect
4+
toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/29ee363f71d060405f729a8f1b7f7aef/redirect
5+
toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/67a0fee3c4236b6397dcbe8575ca2011/redirect
6+
toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/0b98aec810298c2c1d7fdac5dac37910/redirect
7+
toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/658299a896470fbb3103ba3a430ee227/redirect
8+
toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/29ee363f71d060405f729a8f1b7f7aef/redirect
9+
toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/67a0fee3c4236b6397dcbe8575ca2011/redirect
10+
toolchainUrl.WINDOWS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/39846e8427e64a3824c13e399d7d813c/redirect
11+
toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/c9346d9c4bd3ae087fba56b027600ff7/redirect
12+
toolchainVendor=JETBRAINS
13+
toolchainVersion=21

settings.gradle.kts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ pluginManagement {
1111
gradlePluginPortal()
1212
}
1313
}
14+
plugins {
15+
id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0"
16+
}
1417
dependencyResolutionManagement {
1518
repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
1619
repositories {

0 commit comments

Comments
 (0)