diff --git a/.github/workflows/branch.yml b/.github/workflows/branch.yml index 1490df15..7bfc86d2 100644 --- a/.github/workflows/branch.yml +++ b/.github/workflows/branch.yml @@ -45,7 +45,7 @@ jobs: - name: Setup Ruby uses: ruby/setup-ruby@v1 with: - ruby-version: '2.6' + ruby-version: '3.0' - name: Install Dependencies run: gem install bundler && bundle install diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 697bb56a..a7671f2b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -43,7 +43,7 @@ jobs: - name: Setup Ruby uses: ruby/setup-ruby@v1 with: - ruby-version: '2.6' + ruby-version: '3.0' - name: Install Dependencies run: gem install bundler && bundle install diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 78615560..f4633322 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -29,6 +29,9 @@ android { testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } + compileOptions { + isCoreLibraryDesugaringEnabled = true + } signingConfigs { getByName("debug") { @@ -41,8 +44,7 @@ android { buildTypes { debug { - isDebuggable = true - isMinifyEnabled = true + isMinifyEnabled = false signingConfig = signingConfigs.getByName("debug") proguardFiles( getDefaultProguardFile("proguard-android-optimize.txt"), diff --git a/app/src/main/java/com/android254/droidconKE2023/app/DroidconKE2023App.kt b/app/src/main/java/com/android254/droidconKE2023/app/DroidconKE2023App.kt index e3714279..6d6ec4f3 100644 --- a/app/src/main/java/com/android254/droidconKE2023/app/DroidconKE2023App.kt +++ b/app/src/main/java/com/android254/droidconKE2023/app/DroidconKE2023App.kt @@ -40,13 +40,6 @@ class DroidconKE2023App : Application(), Configuration.Provider { initTimber() setUpWorkerManagerNotificationChannel() } - - override fun getWorkManagerConfiguration(): Configuration = - Configuration.Builder() - .setMinimumLoggingLevel(android.util.Log.DEBUG) - .setWorkerFactory(workerFactory) - .build() - private fun initTimber() = when { BuildConfig.DEBUG -> { Timber.plant(object : Timber.DebugTree() { @@ -76,4 +69,10 @@ class DroidconKE2023App : Application(), Configuration.Provider { Configuration.Builder().setWorkerFactory(workerFactory).build() ) } + + override val workManagerConfiguration: Configuration + get() = Configuration.Builder() + .setMinimumLoggingLevel(android.util.Log.DEBUG) + .setWorkerFactory(workerFactory) + .build() } \ No newline at end of file diff --git a/build-logic/gradle/wrapper/gradle-wrapper.properties b/build-logic/gradle/wrapper/gradle-wrapper.properties index 664ef3d3..6f95684a 100644 --- a/build-logic/gradle/wrapper/gradle-wrapper.properties +++ b/build-logic/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Sat Feb 11 12:19:01 EAT 2023 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/datasource/remote/build.gradle.kts b/datasource/remote/build.gradle.kts index c6382010..0b135308 100644 --- a/datasource/remote/build.gradle.kts +++ b/datasource/remote/build.gradle.kts @@ -40,6 +40,8 @@ dependencies { releaseImplementation(libs.chucker.release) debugImplementation(libs.chucker.debug) + coreLibraryDesugaring(libs.desugar.jdk.libs) + testImplementation(libs.app.cash.turbine.turbine) testImplementation(libs.kotlin.coroutines.test) testImplementation(libs.test.androidx.core) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 40db8bc8..eec18699 100755 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,16 +1,16 @@ [versions] -composecompiler = "1.5.3" -coroutines = "1.7.3" +composecompiler = "1.5.14" +coroutines = "1.8.0" coroutines_datetime = "0.4.0" -desugar_jdk_libs = "2.0.3" +desugar_jdk_libs = "2.0.4" espresso = "3.5.1" -gradleplugin = "8.1.2" -gmsPlugin = "4.4.0" +gradleplugin = "8.3.2" +gmsPlugin = "4.4.1" hilt = "2.48.1" -kotlin = "1.9.10" -ksp = "1.9.10-1.0.13" -lifecycle = "2.6.2" -room = "2.6.0" +kotlin = "1.9.24" +ksp = "1.9.21-1.0.15" +lifecycle = "2.7.0" +room = "2.6.1" ktor = "2.2.2" splash = "1.0.1" firebaseCrashlyticsPlugin = "2.9.9" @@ -18,36 +18,36 @@ firebasePerfPlugin = "1.4.2" junit4 = "4.13.2" agp = "7.4.2" chucker = "4.0.0" -androidxComposeBom = "2023.10.01" -remote_config = "21.5.0" +androidxComposeBom = "2024.05.00" +remote_config = "22.0.0" detekt = "1.19.0" klint = "11.6.1" spotless = "6.4.2" app_compat = "1.6.1" -coreKtx = "1.12.0" -hiltsecond = "1.1.0-rc01" -runtime = "2.8.1" -material = "1.10.0" +coreKtx = "1.13.1" +hiltsecond = "1.2.0" +runtime = "2.9.0" +material = "1.12.0" junit = "1.1.5" -coil = "2.4.0" -activity = "1.8.0" +coil = "2.5.0" +activity = "1.9.0" preview_customview = "1.2.0-alpha02" poolingcontainer = "1.0.0" constraintlayout = "1.1.0-alpha13" gson = "2.10.1" swiperefresh = "0.27.0" -auth = "20.7.0" +auth = "21.2.0" lottie = "6.0.0" -paging = "3.2.1" +paging = "3.3.0" result_jvm = "5.2.1" -datastore = "1.0.0" +datastore = "1.1.1" timber = "5.0.1" test_corektx = "1.5.0" test_robolectric = "4.10.3" -test_navigation = "2.7.4" +test_navigation = "2.7.7" test_mockk = "1.12.7" -firebase_bom = "32.4.1" -firebase_common = "20.4.2" +firebase_bom = "33.0.0" +firebase_common = "21.0.0" turbine = "1.0.0" toml_checker = "0.42.0" toml_updater = "0.3.1"