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
4 changes: 2 additions & 2 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ plugins {
android {
// changing this version require to also change it in CI.
// link: https://developer.android.com/ndk/downloads
// Note that we should always take an lts version (end in d, ex: "r27d"), because the dl link
// Note that we should always take an lts version, because the dl link
// could be removed otherwise
ndkVersion = "27.3.13750724"
ndkVersion = "30.0.16248370"

namespace = "io.github.wiiznokes.gitnote"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ import com.mikepenz.markdown.model.markdownInlineContent
import com.mikepenz.markdown.model.markdownPadding
import org.intellij.markdown.flavours.MarkdownFlavourDescriptor
import org.intellij.markdown.flavours.gfm.GFMFlavourDescriptor
import org.intellij.markdown.parser.CancellationToken
import org.intellij.markdown.parser.MarkdownParser


Expand Down Expand Up @@ -78,7 +79,7 @@ fun MarkdownCustomInner(
padding: MarkdownPadding = markdownPadding(),
dimens: MarkdownDimens = markdownDimens(),
flavour: MarkdownFlavourDescriptor = GFMFlavourDescriptor(),
parser: MarkdownParser = MarkdownParser(flavour),
parser: MarkdownParser = MarkdownParser(flavour, cancellationToken = CancellationToken.NonCancellable),
imageTransformer: ImageTransformer = NoOpImageTransformerImpl(),
annotator: MarkdownAnnotator = markdownAnnotator(),
extendedSpans: MarkdownExtendedSpans = markdownExtendedSpans(),
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/rust/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@ MIN_SDK := 21


ifeq ($(OS),Windows_NT)
NDK_PATH ?= ${HOME}/AppData/Local/Android/Sdk/ndk/27.3.13750724/toolchains/llvm/prebuilt/windows-x86_64/bin
NDK_PATH ?= ${HOME}/AppData/Local/Android/Sdk/ndk/30.0.16248370/toolchains/llvm/prebuilt/windows-x86_64/bin
export OPENSSL_NO_VENDOR_PRIV ?= 1
export CARGO_TARGET_X86_64_LINUX_ANDROID_LINKER := x86_64-linux-android${MIN_SDK}-clang.cmd
export CARGO_TARGET_AARCH64_LINUX_ANDROID_LINKER := aarch64-linux-android${MIN_SDK}-clang.cmd
else
NDK_PATH ?= ${HOME}/Android/Sdk/ndk/27.3.13750724/toolchains/llvm/prebuilt/linux-x86_64/bin
NDK_PATH ?= ${HOME}/Android/Sdk/ndk/30.0.16248370/toolchains/llvm/prebuilt/linux-x86_64/bin
export OPENSSL_NO_VENDOR_PRIV ?= 0
export CARGO_TARGET_X86_64_LINUX_ANDROID_LINKER := x86_64-linux-android${MIN_SDK}-clang
export CARGO_TARGET_AARCH64_LINUX_ANDROID_LINKER := aarch64-linux-android${MIN_SDK}-clang
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/rust/NDK_VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
r27d
r30
2 changes: 1 addition & 1 deletion app/src/main/rust/RUST_VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.97.1
1.98.1
16 changes: 8 additions & 8 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
[versions]
agp = "9.3.0"
kotlin = "2.4.10"
agp = "9.4.1"
kotlin = "2.4.20"

ksp = "2.3.4"
ksp = "2.3.6"

core-ktx = "1.19.0"
core-ktx = "1.19.1"
lifecycle-runtime = "2.11.0"
activity-compose = "1.13.0"
datastore-preferences = "1.2.1"
compose-bom = "2026.06.01"
room = "2.8.4"
compose-bom = "2026.09.00"
room = "2.8.5"
sqlite = "3.49.0"
paging = "3.5.0"
compose-markdown = "0.43.0"
paging = "3.5.1"
compose-markdown = "0.45.0"
# todo: remove this dep and use the standard one
reimagined-navigation = "1.5.0"

Expand Down
4 changes: 2 additions & 2 deletions 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
#Fri Sep 25 00:03:06 CEST 2026
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.8.0-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading