wbrawner/SimpleMarkdown
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update dependency androidx.compose:compose-bom to v2024.09.02 #45

Merged
wbrawner merged 6 commits from renovate/composebom into main 2024-10-02 12:36:09 +00:00
Conversation 1 Commits 6 Files changed 9 +18 -16
9 changed files with 18 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/build.gradle.kts
View file

@ -37,11 +37,11 @@ android {
} }
compileSdk = libs.versions.maxSdk.get().toInt() compileSdk = libs.versions.maxSdk.get().toInt()
compileOptions { compileOptions {
sourceCompatibility = JavaVersion.VERSION_1_8 sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_1_8 targetCompatibility = JavaVersion.VERSION_11
} }
kotlinOptions { kotlinOptions {
jvmTarget = "1.8" jvmTarget = "11"
} }
defaultConfig { defaultConfig {
applicationId = "com.wbrawner.simplemarkdown" applicationId = "com.wbrawner.simplemarkdown"

5
app/src/main/java/com/wbrawner/simplemarkdown/ui/MainScreen.kt
View file

@ -4,7 +4,6 @@ import android.content.Intent
import android.net.Uri import android.net.Uri
import androidx.activity.compose.rememberLauncherForActivityResult import androidx.activity.compose.rememberLauncherForActivityResult
import androidx.activity.result.contract.ActivityResultContracts import androidx.activity.result.contract.ActivityResultContracts
import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.background import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Column
@ -327,7 +326,7 @@ private fun MainScreen(
} }
@Composable @Composable
@OptIn(ExperimentalFoundationApi::class, ExperimentalMaterial3Api::class) @OptIn(ExperimentalMaterial3Api::class)
private fun TabbedMarkdownEditor( private fun TabbedMarkdownEditor(
initialMarkdown: String, initialMarkdown: String,
markdown: String, markdown: String,
@ -349,7 +348,7 @@ private fun TabbedMarkdownEditor(
} }
HorizontalPager( HorizontalPager(
modifier = Modifier.fillMaxSize(1f), state = pagerState, modifier = Modifier.fillMaxSize(1f), state = pagerState,
beyondBoundsPageCount = 1, beyondViewportPageCount = 1,
userScrollEnabled = !lockSwiping userScrollEnabled = !lockSwiping
) { page -> ) { page ->
val keyboardController = LocalSoftwareKeyboardController.current val keyboardController = LocalSoftwareKeyboardController.current

1
app/src/main/java/com/wbrawner/simplemarkdown/utility/PreferenceHelper.kt
View file

@ -47,6 +47,7 @@ class AndroidPreferenceHelper(context: Context, private val coroutineScope: Coro
} }
} }
@Suppress("UNCHECKED_CAST")
override fun <T> observe(preference: Preference): StateFlow<T> = states[preference]!!.asStateFlow() as StateFlow<T> override fun <T> observe(preference: Preference): StateFlow<T> = states[preference]!!.asStateFlow() as StateFlow<T>
} }

1
app/src/test/java/com/wbrawner/simplemarkdown/FakePreferenceHelper.kt
View file

@ -23,6 +23,7 @@ class FakePreferenceHelper: PreferenceHelper {
preferences[preference] = value preferences[preference] = value
} }
@Suppress("UNCHECKED_CAST")
override fun <T> observe(preference: Preference): StateFlow<T> = override fun <T> observe(preference: Preference): StateFlow<T> =
preferenceFlow(preference) as StateFlow<T> preferenceFlow(preference) as StateFlow<T>
} }

1
app/src/test/java/com/wbrawner/simplemarkdown/MarkdownViewModelTest.kt
View file

@ -23,6 +23,7 @@ import timber.log.Timber
import java.io.File import java.io.File
import java.net.URI import java.net.URI
@OptIn(ExperimentalCoroutinesApi::class)
class MarkdownViewModelTest { class MarkdownViewModelTest {
private lateinit var fileHelper: FakeFileHelper private lateinit var fileHelper: FakeFileHelper
private lateinit var preferenceHelper: FakePreferenceHelper private lateinit var preferenceHelper: FakePreferenceHelper

6
core/build.gradle.kts
View file

@ -41,11 +41,11 @@ android {
} }
} }
compileOptions { compileOptions {
sourceCompatibility = JavaVersion.VERSION_1_8 sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_1_8 targetCompatibility = JavaVersion.VERSION_11
} }
kotlinOptions { kotlinOptions {
jvmTarget = "1.8" jvmTarget = "11"
} }
lint { lint {
disable += listOf("AndroidGradlePluginVersion", "GradleDependency") disable += listOf("AndroidGradlePluginVersion", "GradleDependency")

6
free/build.gradle.kts
View file

@ -27,11 +27,11 @@ android {
compose = true compose = true
} }
compileOptions { compileOptions {
sourceCompatibility = JavaVersion.VERSION_1_8 sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_1_8 targetCompatibility = JavaVersion.VERSION_11
} }
kotlinOptions { kotlinOptions {
jvmTarget = "1.8" jvmTarget = "11"
} }
lint { lint {
disable += listOf("AndroidGradlePluginVersion", "GradleDependency") disable += listOf("AndroidGradlePluginVersion", "GradleDependency")

2
gradle/libs.versions.toml
View file

@ -6,7 +6,7 @@ appcompat = "1.7.0"
billing = "7.1.0" billing = "7.1.0"
browser = "1.8.0" browser = "1.8.0"
commonMarkVersion = "0.23.0" commonMarkVersion = "0.23.0"
composeBom = "2024.08.00" composeBom = "2024.09.02"
core = "1.6.1" core = "1.6.1"
coreKtx = "1.13.1" coreKtx = "1.13.1"
coreSplashscreen = "1.0.1" coreSplashscreen = "1.0.1"

6
non-free/build.gradle.kts
View file

@ -24,14 +24,14 @@ android {
} }
} }
compileOptions { compileOptions {
sourceCompatibility = JavaVersion.VERSION_1_8 sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_1_8 targetCompatibility = JavaVersion.VERSION_11
} }
buildFeatures { buildFeatures {
compose = true compose = true
} }
kotlinOptions { kotlinOptions {
jvmTarget = "1.8" jvmTarget = "11"
} }
lint { lint {
disable += listOf("AndroidGradlePluginVersion", "GradleDependency") disable += listOf("AndroidGradlePluginVersion", "GradleDependency")