Skip to content

Commit 776a4fa

Browse files
qimikoqimiko
committed
obligatory update commit
1 parent 9528eef commit 776a4fa

File tree

5 files changed

+33
-30
lines changed

5 files changed

+33
-30
lines changed

‎app/build.gradle.kts‎

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ android {
2020
applicationId = "com.geode.launcher"
2121
minSdk = 23
2222
targetSdk = 35
23-
versionCode = 20
24-
versionName = "1.5.0"
23+
versionCode = 21
24+
versionName = "1.6.0"
2525

2626
vectorDrawables {
2727
useSupportLibrary = true
@@ -30,7 +30,7 @@ android {
3030
@Suppress("UnstableApiUsage")
3131
externalNativeBuild {
3232
cmake {
33-
arguments("-DUSE_TULIPHOOK:BOOL=OFF", "-DANDROID_STL=c++_shared")
33+
arguments("-DUSE_TULIPHOOK:BOOL=OFF", "-DANDROID_STL=c++_shared", "-DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES:BOOL=OFF")
3434
}
3535
}
3636

@@ -82,33 +82,34 @@ android {
8282
}
8383
externalNativeBuild {
8484
cmake {
85+
version = "3.25.0+"
8586
path = file("src/main/cpp/CMakeLists.txt")
8687
}
8788
}
8889
namespace = "com.geode.launcher"
89-
ndkVersion = "27.2.12479018"
90+
ndkVersion = "28.1.13356709"
9091
}
9192

9293
dependencies {
9394
implementation (platform("androidx.compose:compose-bom:$composeBOM"))
94-
implementation ("androidx.core:core-ktx:1.15.0")
95+
implementation ("androidx.core:core-ktx:1.16.0")
9596
implementation ("androidx.compose.ui:ui")
9697
implementation ("androidx.compose.material3:material3")
9798
implementation ("androidx.compose.ui:ui-tooling-preview")
9899
implementation ("androidx.lifecycle:lifecycle-runtime-ktx:2.8.7")
99100
implementation ("androidx.lifecycle:lifecycle-viewmodel-compose:2.8.7")
100-
implementation ("androidx.activity:activity-compose:1.10.0")
101-
implementation ("androidx.activity:activity-ktx:1.10.0")
101+
implementation ("androidx.activity:activity-compose:1.10.1")
102+
implementation ("androidx.activity:activity-ktx:1.10.1")
102103
implementation ("androidx.appcompat:appcompat:1.7.0")
103104
implementation ("androidx.documentfile:documentfile:1.0.1")
104-
implementation ("com.squareup.okio:okio:3.10.2")
105+
implementation ("com.squareup.okio:okio:3.11.0")
105106
implementation ("com.squareup.okhttp3:okhttp:4.12.0")
106-
implementation ("org.jetbrains.kotlinx:kotlinx-serialization-json:1.8.0")
107-
implementation ("org.jetbrains.kotlinx:kotlinx-serialization-json-okio:1.8.0")
108-
implementation ("org.jetbrains.kotlinx:kotlinx-datetime:0.6.1")
109-
implementation ("com.mikepenz:multiplatform-markdown-renderer-android:0.30.0")
110-
implementation ("com.mikepenz:multiplatform-markdown-renderer-m3:0.30.0")
111-
implementation("androidx.browser:browser:1.8.0")
107+
implementation ("org.jetbrains.kotlinx:kotlinx-serialization-json:1.8.1")
108+
implementation ("org.jetbrains.kotlinx:kotlinx-serialization-json-okio:1.8.1")
109+
implementation ("org.jetbrains.kotlinx:kotlinx-datetime:0.6.2")
110+
implementation ("com.mikepenz:multiplatform-markdown-renderer-android:0.33.0")
111+
implementation ("com.mikepenz:multiplatform-markdown-renderer-m3:0.33.0")
112+
implementation ("androidx.browser:browser:1.8.0")
112113
debugImplementation ("androidx.compose.ui:ui-tooling")
113-
coreLibraryDesugaring ("com.android.tools:desugar_jdk_libs:2.1.4")
114+
coreLibraryDesugaring ("com.android.tools:desugar_jdk_libs:2.1.5")
114115
}

‎app/src/main/cpp/CMakeLists.txt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,9 @@ if (USE_TULIPHOOK)
2424
target_link_libraries(launcherfix PRIVATE TulipHook TulipHookInclude)
2525
else()
2626
FetchContent_Declare(dobby
27+
# this is the last version that builds on android at all
2728
GIT_REPOSITORY https://github.com/jmpews/Dobby
28-
GIT_TAG 6a80a61ea062424d1595613058a174c64454fa57
29+
GIT_TAG 0932d69c320e786672361ab53825ba8f4245e9d3
2930
)
3031

3132
FetchContent_GetProperties(dobby)

‎app/src/main/java/com/geode/launcher/main/UpdateComponents.kt‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,9 @@ import com.geode.launcher.utils.LaunchUtils
5858
import com.geode.launcher.utils.PreferenceUtils
5959
import com.mikepenz.markdown.compose.LocalBulletListHandler
6060
import com.mikepenz.markdown.m3.Markdown
61-
import com.mikepenz.markdown.m3.markdownColor
6261
import com.mikepenz.markdown.m3.markdownTypography
6362
import kotlinx.datetime.toJavaInstant
63+
import org.intellij.markdown.flavours.gfm.GFMFlavourDescriptor
6464
import java.io.File
6565
import java.net.ConnectException
6666
import java.net.UnknownHostException
@@ -191,17 +191,17 @@ fun LauncherUpdateInformation(onDismiss: () -> Unit) {
191191
style = Typography.titleLarge
192192
)
193193

194-
CompositionLocalProvider(LocalBulletListHandler provides { _, _, _ -> "•  " }) {
194+
// every new release of the markdown library adds another arg to it
195+
CompositionLocalProvider(LocalBulletListHandler provides { _, _, _, _, _ -> "•  " }) {
195196
Markdown(
196197
content = nextRelease.release.body.replace("\r", ""),
197-
colors = markdownColor(
198-
linkText = MaterialTheme.colorScheme.primary
199-
),
200198
typography = markdownTypography(
201199
link = MaterialTheme.typography.bodyLarge.copy(
202-
textDecoration = TextDecoration.Underline
203-
)
200+
textDecoration = TextDecoration.Underline,
201+
color = MaterialTheme.colorScheme.primary,
202+
),
204203
),
204+
flavour = GFMFlavourDescriptor(),
205205
)
206206
}
207207
}

‎build.gradle.kts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
buildscript {
2-
val composeBOM by extra("2025.01.00")
2+
val composeBOM by extra("2025.04.01")
33
}
44

55
// Top-level build file where you can add configuration options common to all sub-projects/modules.
66
plugins {
7-
id("com.android.application") version "8.8.0" apply false
8-
id("com.android.library") version "8.8.0" apply false
9-
id("org.jetbrains.kotlin.android") version "2.1.0" apply false
10-
id("org.jetbrains.kotlin.plugin.serialization") version "2.1.0" apply false
11-
id("org.jetbrains.kotlin.plugin.compose") version "2.1.0" apply false
7+
id("com.android.application") version "8.9.2" apply false
8+
id("com.android.library") version "8.9.2" apply false
9+
id("org.jetbrains.kotlin.android") version "2.1.20" apply false
10+
id("org.jetbrains.kotlin.plugin.serialization") version "2.1.20" apply false
11+
id("org.jetbrains.kotlin.plugin.compose") version "2.1.20" apply false
1212
}
1313

1414
tasks.register<Delete>("clean") {

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1+
#Thu Apr 24 10:54:01 MST 2025
12
distributionBase=GRADLE_USER_HOME
23
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
45
networkTimeout=10000
56
validateDistributionUrl=true
67
zipStoreBase=GRADLE_USER_HOME

0 commit comments

Comments
 (0)