Skip to content
Merged
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
26 changes: 14 additions & 12 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import java.time.format.DateTimeFormatter

plugins {
alias(libs.plugins.android.application)
alias(libs.plugins.kotlin.android)
alias(libs.plugins.compose.compiler)
// for room
alias(libs.plugins.ksp)
Expand All @@ -23,7 +22,9 @@ android {
ndkVersion = "27.3.13750724"

namespace = "io.github.wiiznokes.gitnote"
compileSdk = 36

// https://developer.android.com/about/versions
compileSdk = 37

dependenciesInfo {
// Disables dependency metadata when building APKs (for IzzyOnDroid/F-Droid)
Expand All @@ -49,7 +50,7 @@ android {

applicationId = "io.github.wiiznokes.gitnote"
minSdk = 30
targetSdk = 36

versionCode = 16
versionName = "26.03"

Expand Down Expand Up @@ -116,16 +117,7 @@ android {
}
}

ksp {
arg("room.schemaLocation", "$projectDir/schemas")
}

kotlin {
compilerOptions {
// set the target JVM bytecode
jvmTarget.set(JvmTarget.JVM_21)
}
}

buildFeatures {
buildConfig = true
Expand All @@ -139,9 +131,18 @@ android {

}

ksp {
arg("room.schemaLocation", "$projectDir/schemas")
}

kotlin {
// set what version of the jdk will be use to compile the code
jvmToolchain(21)

compilerOptions {
// set the target JVM bytecode
jvmTarget.set(JvmTarget.JVM_21)
}
}

dependencies {
Expand Down Expand Up @@ -184,6 +185,7 @@ dependencies {

// unit test
testImplementation(kotlin("test"))
testImplementation(kotlin("test-junit"))

// integration test
androidTestImplementation(composeBom)
Expand Down
1 change: 0 additions & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
plugins {
alias(libs.plugins.android.application) apply false
alias(libs.plugins.kotlin.android) apply false
alias(libs.plugins.compose.compiler) apply false
alias(libs.plugins.ksp) apply false
}
12 changes: 12 additions & 0 deletions gradle/gradle-daemon-jvm.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
#This file is generated by updateDaemonJvm
toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/ec7520a1e057cd116f9544c42142a16b/redirect
toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/4c4f879899012ff0a8b2e2117df03b0e/redirect
toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/ec7520a1e057cd116f9544c42142a16b/redirect
toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/4c4f879899012ff0a8b2e2117df03b0e/redirect
toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/73bcfb608d1fde9fb62e462f834a3299/redirect
toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/846ee0d876d26a26f37aa1ce8de73224/redirect
toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/ec7520a1e057cd116f9544c42142a16b/redirect
toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/4c4f879899012ff0a8b2e2117df03b0e/redirect
toolchainUrl.WINDOWS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/9482ddec596298c84656d31d16652665/redirect
toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/39701d92e1756bb2f141eb67cd4c660e/redirect
toolchainVersion=21
15 changes: 7 additions & 8 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
[versions]
agp = "8.13.2"
kotlin = "2.3.0"
agp = "9.2.1"
kotlin = "2.3.21"

ksp = "2.3.4"

core-ktx = "1.17.0"
core-ktx = "1.18.0"
lifecycle-runtime = "2.10.0"
activity-compose = "1.12.2"
datastore-preferences = "1.2.0"
compose-bom = "2026.01.00"
activity-compose = "1.13.0"
datastore-preferences = "1.2.1"
compose-bom = "2026.05.00"
room = "2.8.4"
sqlite = "3.49.0"
paging = "3.3.6"
paging = "3.5.0"
compose-markdown = "0.5.8"
# todo: remove this dep and use the standard one
reimagined-navigation = "1.5.0"
Expand Down Expand Up @@ -62,6 +62,5 @@ androidx-test-runner = { group = "androidx.test", name = "runner", version.ref =

[plugins]
android-application = { id = "com.android.application", version.ref = "agp" }
kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Wed Feb 28 02:22:38 CET 2024
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.0-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists