Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(deps): update dependency androidx.compose:compose-bom to v2023.08.00 #266

Merged
merged 5 commits into from
Aug 31, 2023
Merged

fix(deps): update dependency androidx.compose:compose-bom to v2023.08.00 #266

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fcc9f0c
fix(deps): update dependency androidx.compose:compose-bom to v2023.08.00
renovate[bot] Aug 9, 2023
49c42a2
chore: move minSdk & targetSdk to Version Catalog
mslalith Aug 10, 2023
f6aefdc
chore: use global configuration for robolectric
mslalith Aug 31, 2023
7bb7141
chore: bump Kotlin to 1.9.0, target SDK to 34, Compose Compiler to 1.5.1
mslalith Aug 31, 2023
ef1a456
Merge branch 'develop' into renovate/androidxcomposebom
mslalith Aug 31, 2023
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
6 changes: 3 additions & 3 deletions benchmark/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ plugins {

android {
namespace = "dev.mslalith.focuslauncher.benchmark"
compileSdk = 33
compileSdk = libs.versions.androidTargetSdk.get().toInt()

defaultConfig {
minSdk = 26
targetSdk = 33
minSdk = libs.versions.androidMinSdk.get().toInt()
targetSdk = libs.versions.androidTargetSdk.get().toInt()

testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
}
Expand Down
6 changes: 5 additions & 1 deletion build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,14 @@ import com.android.build.api.dsl.ApplicationExtension
import dev.mslalith.focuslauncher.configureKotlinAndroid
import org.gradle.api.Plugin
import org.gradle.api.Project
import org.gradle.api.artifacts.VersionCatalogsExtension
import org.gradle.kotlin.dsl.configure
import org.gradle.kotlin.dsl.getByType

class AndroidApplicationConventionPlugin : Plugin<Project> {
override fun apply(target: Project) = with(target) {
val libs = extensions.getByType<VersionCatalogsExtension>().named("libs")

with(pluginManager) {
apply("com.android.application")
apply("org.jetbrains.kotlin.android")
Expand All @@ -14,7 +18,7 @@ class AndroidApplicationConventionPlugin : Plugin<Project> {

extensions.configure<ApplicationExtension> {
configureKotlinAndroid(commonExtension = this)
defaultConfig.targetSdk = 33
defaultConfig.targetSdk = libs.findVersion("androidTargetSdk").get().requiredVersion.toInt()
}
}
}
2 changes: 1 addition & 1 deletion build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ class AndroidLibraryConventionPlugin : Plugin<Project> {

extensions.configure<LibraryExtension> {
configureKotlinAndroid(commonExtension = this)
defaultConfig.targetSdk = 33
defaultConfig.targetSdk = libs.findVersion("androidTargetSdk").get().requiredVersion.toInt()
}
}
}
8 changes: 6 additions & 2 deletions build-logic/convention/src/main/kotlin/dev/mslalith/focuslauncher/KotlinAndroid.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,20 @@ package dev.mslalith.focuslauncher
import com.android.build.api.dsl.CommonExtension
import org.gradle.api.JavaVersion
import org.gradle.api.Project
import org.gradle.api.artifacts.VersionCatalogsExtension
import org.gradle.api.plugins.ExtensionAware
import org.gradle.kotlin.dsl.getByType
import org.jetbrains.kotlin.gradle.dsl.KotlinJvmOptions

internal fun Project.configureKotlinAndroid(
commonExtension: CommonExtension<*, *, *, *, *>,
) = with(commonExtension) {
compileSdk = 33
val libs = extensions.getByType<VersionCatalogsExtension>().named("libs")

compileSdk = libs.findVersion("androidTargetSdk").get().requiredVersion.toInt()

defaultConfig {
minSdk = 26
minSdk = libs.findVersion("androidMinSdk").get().requiredVersion.toInt()
}

compileOptions {
Expand Down
1 change: 1 addition & 0 deletions build-logic/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,6 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
4 changes: 2 additions & 2 deletions core/data/src/test/kotlin/dev/mslalith/focuslauncher/core/data/database/MigrationTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ import androidx.sqlite.db.SupportSQLiteDatabase
import androidx.sqlite.db.framework.FrameworkSQLiteOpenHelperFactory
import androidx.test.platform.app.InstrumentationRegistry
import com.google.common.truth.Truth.assertThat
import dev.mslalith.focuslauncher.core.testing.AppRobolectricTestRunner
import org.junit.Rule
import org.junit.Test
import org.junit.runner.RunWith
import org.robolectric.RobolectricTestRunner

@RunWith(RobolectricTestRunner::class)
@RunWith(AppRobolectricTestRunner::class)
class MigrationTest {

private val testDbName = "migration-test"
Expand Down
4 changes: 2 additions & 2 deletions ...in/dev/mslalith/focuslauncher/core/data/database/usecase/room/CloseDatabaseUseCaseTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,19 @@ import dagger.hilt.android.testing.HiltAndroidRule
import dagger.hilt.android.testing.HiltAndroidTest
import dagger.hilt.android.testing.HiltTestApplication
import dev.mslalith.focuslauncher.core.data.database.AppDatabase
import dev.mslalith.focuslauncher.core.testing.AppRobolectricTestRunner
import dev.mslalith.focuslauncher.core.testing.CoroutineTest
import org.junit.Before
import org.junit.FixMethodOrder
import org.junit.Rule
import org.junit.Test
import org.junit.runner.RunWith
import org.junit.runners.MethodSorters
import org.robolectric.RobolectricTestRunner
import org.robolectric.annotation.Config
import javax.inject.Inject

@HiltAndroidTest
@RunWith(RobolectricTestRunner::class)
@RunWith(AppRobolectricTestRunner::class)
@Config(application = HiltTestApplication::class)
@FixMethodOrder(value = MethodSorters.NAME_ASCENDING)
internal class CloseDatabaseUseCaseTest : CoroutineTest() {
Expand Down
4 changes: 2 additions & 2 deletions ...data/src/test/kotlin/dev/mslalith/focuslauncher/core/data/repository/AppDrawerRepoTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import com.google.common.truth.Truth.assertThat
import dagger.hilt.android.testing.HiltAndroidRule
import dagger.hilt.android.testing.HiltAndroidTest
import dagger.hilt.android.testing.HiltTestApplication
import dev.mslalith.focuslauncher.core.testing.AppRobolectricTestRunner
import dev.mslalith.focuslauncher.core.testing.CoroutineTest
import dev.mslalith.focuslauncher.core.testing.TestApps
import dev.mslalith.focuslauncher.core.testing.extensions.awaitItem
Expand All @@ -12,11 +13,10 @@ import org.junit.Before
import org.junit.Rule
import org.junit.Test
import org.junit.runner.RunWith
import org.robolectric.RobolectricTestRunner
import org.robolectric.annotation.Config

@HiltAndroidTest
@RunWith(RobolectricTestRunner::class)
@RunWith(AppRobolectricTestRunner::class)
@Config(application = HiltTestApplication::class)
internal class AppDrawerRepoTest : CoroutineTest() {

Expand Down
4 changes: 2 additions & 2 deletions core/data/src/test/kotlin/dev/mslalith/focuslauncher/core/data/repository/ClockRepoTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import dagger.hilt.android.testing.HiltAndroidRule
import dagger.hilt.android.testing.HiltAndroidTest
import dagger.hilt.android.testing.HiltTestApplication
import dev.mslalith.focuslauncher.core.common.providers.clock.test.TestClockProvider
import dev.mslalith.focuslauncher.core.testing.AppRobolectricTestRunner
import dev.mslalith.focuslauncher.core.testing.CoroutineTest
import dev.mslalith.focuslauncher.core.testing.extensions.awaitItem
import dev.mslalith.focuslauncher.core.testing.extensions.instantOf
Expand All @@ -16,11 +17,10 @@ import org.junit.Before
import org.junit.Rule
import org.junit.Test
import org.junit.runner.RunWith
import org.robolectric.RobolectricTestRunner
import org.robolectric.annotation.Config

@HiltAndroidTest
@RunWith(RobolectricTestRunner::class)
@RunWith(AppRobolectricTestRunner::class)
@Config(application = HiltTestApplication::class)
internal class ClockRepoTest : CoroutineTest() {

Expand Down
4 changes: 2 additions & 2 deletions ...data/src/test/kotlin/dev/mslalith/focuslauncher/core/data/repository/FavoritesRepoTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import dagger.hilt.android.testing.HiltTestApplication
import dev.mslalith.focuslauncher.core.data.database.AppDatabase
import dev.mslalith.focuslauncher.core.data.dto.toAppRoom
import dev.mslalith.focuslauncher.core.model.app.App
import dev.mslalith.focuslauncher.core.testing.AppRobolectricTestRunner
import dev.mslalith.focuslauncher.core.testing.CoroutineTest
import dev.mslalith.focuslauncher.core.testing.TestApps
import dev.mslalith.focuslauncher.core.testing.extensions.awaitItem
Expand All @@ -17,11 +18,10 @@ import org.junit.Before
import org.junit.Rule
import org.junit.Test
import org.junit.runner.RunWith
import org.robolectric.RobolectricTestRunner
import org.robolectric.annotation.Config

@HiltAndroidTest
@RunWith(RobolectricTestRunner::class)
@RunWith(AppRobolectricTestRunner::class)
@Config(application = HiltTestApplication::class)
internal class FavoritesRepoTest : CoroutineTest() {

Expand Down
4 changes: 2 additions & 2 deletions ...ata/src/test/kotlin/dev/mslalith/focuslauncher/core/data/repository/HiddenAppsRepoTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import dagger.hilt.android.testing.HiltTestApplication
import dev.mslalith.focuslauncher.core.data.database.AppDatabase
import dev.mslalith.focuslauncher.core.data.dto.toAppRoom
import dev.mslalith.focuslauncher.core.model.app.App
import dev.mslalith.focuslauncher.core.testing.AppRobolectricTestRunner
import dev.mslalith.focuslauncher.core.testing.CoroutineTest
import dev.mslalith.focuslauncher.core.testing.TestApps
import dev.mslalith.focuslauncher.core.testing.extensions.awaitItem
Expand All @@ -17,11 +18,10 @@ import org.junit.Before
import org.junit.Rule
import org.junit.Test
import org.junit.runner.RunWith
import org.robolectric.RobolectricTestRunner
import org.robolectric.annotation.Config

@HiltAndroidTest
@RunWith(RobolectricTestRunner::class)
@RunWith(AppRobolectricTestRunner::class)
@Config(application = HiltTestApplication::class)
internal class HiddenAppsRepoTest : CoroutineTest() {

Expand Down
4 changes: 2 additions & 2 deletions .../test/kotlin/dev/mslalith/focuslauncher/core/data/repository/LunarPhaseDetailsRepoTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import dev.mslalith.focuslauncher.core.model.lunarphase.LunarPhaseDetails
import dev.mslalith.focuslauncher.core.model.lunarphase.NextPhaseDetails
import dev.mslalith.focuslauncher.core.model.lunarphase.RiseAndSetDetails
import dev.mslalith.focuslauncher.core.model.lunarphase.UpcomingLunarPhase
import dev.mslalith.focuslauncher.core.testing.AppRobolectricTestRunner
import dev.mslalith.focuslauncher.core.testing.CoroutineTest
import dev.mslalith.focuslauncher.core.testing.extensions.awaitItem
import dev.mslalith.focuslauncher.core.testing.extensions.instantOf
Expand All @@ -23,11 +24,10 @@ import org.junit.Before
import org.junit.Rule
import org.junit.Test
import org.junit.runner.RunWith
import org.robolectric.RobolectricTestRunner
import org.robolectric.annotation.Config

@HiltAndroidTest
@RunWith(RobolectricTestRunner::class)
@RunWith(AppRobolectricTestRunner::class)
@Config(application = HiltTestApplication::class)
internal class LunarPhaseDetailsRepoTest : CoroutineTest() {

Expand Down
4 changes: 2 additions & 2 deletions core/data/src/test/kotlin/dev/mslalith/focuslauncher/core/data/repository/PlacesRepoTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,18 @@ import dagger.hilt.android.testing.HiltAndroidTest
import dagger.hilt.android.testing.HiltTestApplication
import dev.mslalith.focuslauncher.core.data.utils.dummyPlaceFor
import dev.mslalith.focuslauncher.core.model.location.LatLng
import dev.mslalith.focuslauncher.core.testing.AppRobolectricTestRunner
import dev.mslalith.focuslauncher.core.testing.CoroutineTest
import javax.inject.Inject
import kotlinx.coroutines.runBlocking
import org.junit.Before
import org.junit.Rule
import org.junit.Test
import org.junit.runner.RunWith
import org.robolectric.RobolectricTestRunner
import org.robolectric.annotation.Config

@HiltAndroidTest
@RunWith(RobolectricTestRunner::class)
@RunWith(AppRobolectricTestRunner::class)
@Config(application = HiltTestApplication::class)
internal class PlacesRepoTest : CoroutineTest() {

Expand Down
4 changes: 2 additions & 2 deletions core/data/src/test/kotlin/dev/mslalith/focuslauncher/core/data/repository/QuotesRepoTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import dev.mslalith.focuslauncher.core.data.database.AppDatabase
import dev.mslalith.focuslauncher.core.data.utils.dummyQuoteFor
import dev.mslalith.focuslauncher.core.model.Constants.Defaults.QUOTES_LIMIT_PER_PAGE
import dev.mslalith.focuslauncher.core.model.Quote
import dev.mslalith.focuslauncher.core.testing.AppRobolectricTestRunner
import dev.mslalith.focuslauncher.core.testing.CoroutineTest
import dev.mslalith.focuslauncher.core.testing.extensions.awaitItem
import javax.inject.Inject
Expand All @@ -20,11 +21,10 @@ import org.junit.Before
import org.junit.Rule
import org.junit.Test
import org.junit.runner.RunWith
import org.robolectric.RobolectricTestRunner
import org.robolectric.annotation.Config

@HiltAndroidTest
@RunWith(RobolectricTestRunner::class)
@RunWith(AppRobolectricTestRunner::class)
@Config(application = HiltTestApplication::class)
internal class QuotesRepoTest : CoroutineTest() {

Expand Down
4 changes: 2 additions & 2 deletions core/data/src/test/kotlin/dev/mslalith/focuslauncher/core/data/repository/ThemeRepoTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,17 @@ import dagger.hilt.android.testing.HiltTestApplication
import dev.mslalith.focuslauncher.core.data.helpers.verifyChange
import dev.mslalith.focuslauncher.core.model.Constants.Defaults.Settings.General.DEFAULT_THEME
import dev.mslalith.focuslauncher.core.model.Theme
import dev.mslalith.focuslauncher.core.testing.AppRobolectricTestRunner
import dev.mslalith.focuslauncher.core.testing.CoroutineTest
import javax.inject.Inject
import org.junit.Before
import org.junit.Rule
import org.junit.Test
import org.junit.runner.RunWith
import org.robolectric.RobolectricTestRunner
import org.robolectric.annotation.Config

@HiltAndroidTest
@RunWith(RobolectricTestRunner::class)
@RunWith(AppRobolectricTestRunner::class)
@Config(application = HiltTestApplication::class)
internal class ThemeRepoTest : CoroutineTest() {

Expand Down
4 changes: 2 additions & 2 deletions ...lin/dev/mslalith/focuslauncher/core/data/repository/settings/AppDrawerSettingsRepoTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,17 @@ import dev.mslalith.focuslauncher.core.model.Constants.Defaults.Settings.AppDraw
import dev.mslalith.focuslauncher.core.model.Constants.Defaults.Settings.AppDrawer.DEFAULT_APP_ICONS
import dev.mslalith.focuslauncher.core.model.Constants.Defaults.Settings.AppDrawer.DEFAULT_SEARCH_BAR
import dev.mslalith.focuslauncher.core.model.appdrawer.AppDrawerIconViewType
import dev.mslalith.focuslauncher.core.testing.AppRobolectricTestRunner
import dev.mslalith.focuslauncher.core.testing.CoroutineTest
import javax.inject.Inject
import org.junit.Before
import org.junit.Rule
import org.junit.Test
import org.junit.runner.RunWith
import org.robolectric.RobolectricTestRunner
import org.robolectric.annotation.Config

@HiltAndroidTest
@RunWith(RobolectricTestRunner::class)
@RunWith(AppRobolectricTestRunner::class)
@Config(application = HiltTestApplication::class)
internal class AppDrawerSettingsRepoTest : CoroutineTest() {

Expand Down
4 changes: 2 additions & 2 deletions .../kotlin/dev/mslalith/focuslauncher/core/data/repository/settings/ClockSettingsRepoTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,17 @@ import dev.mslalith.focuslauncher.core.model.ClockAlignment
import dev.mslalith.focuslauncher.core.model.Constants.Defaults.Settings.Clock.DEFAULT_CLOCK_24_ANIMATION_DURATION
import dev.mslalith.focuslauncher.core.model.Constants.Defaults.Settings.Clock.DEFAULT_CLOCK_ALIGNMENT
import dev.mslalith.focuslauncher.core.model.Constants.Defaults.Settings.Clock.DEFAULT_SHOW_CLOCK_24
import dev.mslalith.focuslauncher.core.testing.AppRobolectricTestRunner
import dev.mslalith.focuslauncher.core.testing.CoroutineTest
import javax.inject.Inject
import org.junit.Before
import org.junit.Rule
import org.junit.Test
import org.junit.runner.RunWith
import org.robolectric.RobolectricTestRunner
import org.robolectric.annotation.Config

@HiltAndroidTest
@RunWith(RobolectricTestRunner::class)
@RunWith(AppRobolectricTestRunner::class)
@Config(application = HiltTestApplication::class)
internal class ClockSettingsRepoTest : CoroutineTest() {

Expand Down
4 changes: 2 additions & 2 deletions ...otlin/dev/mslalith/focuslauncher/core/data/repository/settings/GeneralSettingsRepoTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,17 @@ import dev.mslalith.focuslauncher.core.model.Constants.Defaults.Settings.General
import dev.mslalith.focuslauncher.core.model.Constants.Defaults.Settings.General.DEFAULT_NOTIFICATION_SHADE
import dev.mslalith.focuslauncher.core.model.Constants.Defaults.Settings.General.DEFAULT_STATUS_BAR
import dev.mslalith.focuslauncher.core.model.IconPackType
import dev.mslalith.focuslauncher.core.testing.AppRobolectricTestRunner
import dev.mslalith.focuslauncher.core.testing.CoroutineTest
import javax.inject.Inject
import org.junit.Before
import org.junit.Rule
import org.junit.Test
import org.junit.runner.RunWith
import org.robolectric.RobolectricTestRunner
import org.robolectric.annotation.Config

@HiltAndroidTest
@RunWith(RobolectricTestRunner::class)
@RunWith(AppRobolectricTestRunner::class)
@Config(application = HiltTestApplication::class)
internal class GeneralSettingsRepoTest : CoroutineTest() {

Expand Down
4 changes: 2 additions & 2 deletions ...in/dev/mslalith/focuslauncher/core/data/repository/settings/LunarPhaseSettingsRepoTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,17 @@ import dev.mslalith.focuslauncher.core.model.Constants.Defaults.Settings.LunarPh
import dev.mslalith.focuslauncher.core.model.Constants.Defaults.Settings.LunarPhase.DEFAULT_SHOW_UPCOMING_PHASE_DETAILS
import dev.mslalith.focuslauncher.core.model.CurrentPlace
import dev.mslalith.focuslauncher.core.model.location.LatLng
import dev.mslalith.focuslauncher.core.testing.AppRobolectricTestRunner
import dev.mslalith.focuslauncher.core.testing.CoroutineTest
import javax.inject.Inject
import org.junit.Before
import org.junit.Rule
import org.junit.Test
import org.junit.runner.RunWith
import org.robolectric.RobolectricTestRunner
import org.robolectric.annotation.Config

@HiltAndroidTest
@RunWith(RobolectricTestRunner::class)
@RunWith(AppRobolectricTestRunner::class)
@Config(application = HiltTestApplication::class)
internal class LunarPhaseSettingsRepoTest : CoroutineTest() {

Expand Down
4 changes: 2 additions & 2 deletions ...kotlin/dev/mslalith/focuslauncher/core/data/repository/settings/QuotesSettingsRepoTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,17 @@ import dagger.hilt.android.testing.HiltAndroidTest
import dagger.hilt.android.testing.HiltTestApplication
import dev.mslalith.focuslauncher.core.data.helpers.verifyChange
import dev.mslalith.focuslauncher.core.model.Constants.Defaults.Settings.Quotes.DEFAULT_SHOW_QUOTES
import dev.mslalith.focuslauncher.core.testing.AppRobolectricTestRunner
import dev.mslalith.focuslauncher.core.testing.CoroutineTest
import javax.inject.Inject
import org.junit.Before
import org.junit.Rule
import org.junit.Test
import org.junit.runner.RunWith
import org.robolectric.RobolectricTestRunner
import org.robolectric.annotation.Config

@HiltAndroidTest
@RunWith(RobolectricTestRunner::class)
@RunWith(AppRobolectricTestRunner::class)
@Config(application = HiltTestApplication::class)
internal class QuotesSettingsRepoTest : CoroutineTest() {

Expand Down
Loading