From a7f0c599cf4328fc1b3a8590b6599c98671af357 Mon Sep 17 00:00:00 2001 From: jacqui Date: Fri, 13 Oct 2023 21:21:30 +0300 Subject: [PATCH 1/7] Update about page content in the string file --- presentation/src/main/res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/presentation/src/main/res/values/strings.xml b/presentation/src/main/res/values/strings.xml index 6c8ee760..e2a47e59 100644 --- a/presentation/src/main/res/values/strings.xml +++ b/presentation/src/main/res/values/strings.xml @@ -25,7 +25,7 @@ Your feedback helps us improve Feedback About - Droidcon is a global conference focused on the engineering of Android applications. Droidcon provides a forum for developers to network with other developers, share techniques, announce apps and products, and to learn and teach.\n\nThis two-day developer focused gathering will be held in Nairobi Kenya on August 6th to 8th 2020 and will be the largest of its kind in Africa.\n\nIt will have workshops and codelabs focused on the building of Android applications and will give participants an excellent chance to learn about the local Android development ecosystem, opportunities and services as well as meet the engineers and companies who work on them. + Droidcon is a global conference focused on the engineering of Android applications. Droidcon provides a forum for developers to network with other developers, share techniques, announce apps and products, and to learn and teach.\n\nThis three-day developer focused gathering will be held in Nairobi Kenya on November 8th to 10th 2023 and will be the largest of its kind in Africa.\n\nIt will have workshops and codelabs focused on the building of Android applications and will give participants an excellent chance to learn about the local Android development ecosystem, opportunities and services as well as meet the engineers and companies who work on them. Organizing Team Organized by; Logo From 6d8d1fe28f4c9bc74bd2d355d21ad4500b0f1d97 Mon Sep 17 00:00:00 2001 From: jacqui Date: Fri, 13 Oct 2023 23:13:17 +0300 Subject: [PATCH 2/7] Updating About page Content --- presentation/src/main/res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/presentation/src/main/res/values/strings.xml b/presentation/src/main/res/values/strings.xml index e2a47e59..b536d3cd 100644 --- a/presentation/src/main/res/values/strings.xml +++ b/presentation/src/main/res/values/strings.xml @@ -25,7 +25,7 @@ Your feedback helps us improve Feedback About - Droidcon is a global conference focused on the engineering of Android applications. Droidcon provides a forum for developers to network with other developers, share techniques, announce apps and products, and to learn and teach.\n\nThis three-day developer focused gathering will be held in Nairobi Kenya on November 8th to 10th 2023 and will be the largest of its kind in Africa.\n\nIt will have workshops and codelabs focused on the building of Android applications and will give participants an excellent chance to learn about the local Android development ecosystem, opportunities and services as well as meet the engineers and companies who work on them. + Droidcon is a global conference focused on the engineering of Android applications. Droidcon provides a forum for developers to network with other developers, share techniques, announce apps and products, and to learn and teach.\n\nThis three-day developer focused gathering will be held in Nairobi, Kenya on November 8th to 10th 2023 and will be the largest of its kind in Africa.\n\nIt will have workshops and codelabs focused on the building of Android applications and will give participants an excellent chance to learn about the local Android development ecosystem, opportunities and services as well as meet the engineers and companies who work on them. Organizing Team Organized by; Logo From 83b4145bff79b8acad63766e389fafc21f02147d Mon Sep 17 00:00:00 2001 From: jacqui Date: Wed, 18 Oct 2023 23:41:12 +0300 Subject: [PATCH 3/7] Changing the home_header_welcome_label in strings.xml --- presentation/src/main/res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/presentation/src/main/res/values/strings.xml b/presentation/src/main/res/values/strings.xml index b536d3cd..df6ea2ea 100644 --- a/presentation/src/main/res/values/strings.xml +++ b/presentation/src/main/res/values/strings.xml @@ -36,7 +36,7 @@ Speaker headshot Session Speakers - Welcome to the largest Focussed Android Developer community in Africa + Welcome to the largest Android Focussed Developer community in Africa Event poster Call for speakers Call for speakers From 04afdf649331da4450f6f3f3d539738ad59fbf50 Mon Sep 17 00:00:00 2001 From: jacqui Date: Thu, 4 Apr 2024 23:33:18 +0300 Subject: [PATCH 4/7] Configuring CoreLibraryDesugaring --- app/build.gradle.kts | 3 +++ build-logic/gradle/wrapper/gradle-wrapper.properties | 2 +- datasource/remote/build.gradle.kts | 2 ++ gradle/libs.versions.toml | 2 +- 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 78615560..0c4db0ff 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") { 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..03012c12 100755 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -4,7 +4,7 @@ coroutines = "1.7.3" coroutines_datetime = "0.4.0" desugar_jdk_libs = "2.0.3" espresso = "3.5.1" -gradleplugin = "8.1.2" +gradleplugin = "8.3.1" gmsPlugin = "4.4.0" hilt = "2.48.1" kotlin = "1.9.10" From ee8dc1b0673b8598f0eed93833b1144ef815fda1 Mon Sep 17 00:00:00 2001 From: jacqui Date: Mon, 27 May 2024 16:20:57 +0300 Subject: [PATCH 5/7] Updated dependencies --- gradle/libs.versions.toml | 44 +++++++++++++++++++-------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 03012c12..e42405e0 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.3.1" -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" +ksp = "1.9.21-1.0.15" +lifecycle = "2.8.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" From f24bd8b4a1ca0a6ed398f0e6d6a2a98b775b4987 Mon Sep 17 00:00:00 2001 From: jacqui Date: Fri, 31 May 2024 01:43:48 +0300 Subject: [PATCH 6/7] Updated dependencies and override members in the DroidconKE2023App.kt files --- app/build.gradle.kts | 3 +-- .../droidconKE2023/app/DroidconKE2023App.kt | 13 ++++++------- gradle/libs.versions.toml | 4 ++-- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 0c4db0ff..f4633322 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -44,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/gradle/libs.versions.toml b/gradle/libs.versions.toml index e42405e0..eec18699 100755 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -7,9 +7,9 @@ espresso = "3.5.1" gradleplugin = "8.3.2" gmsPlugin = "4.4.1" hilt = "2.48.1" -kotlin = "1.9.10" +kotlin = "1.9.24" ksp = "1.9.21-1.0.15" -lifecycle = "2.8.0" +lifecycle = "2.7.0" room = "2.6.1" ktor = "2.2.2" splash = "1.0.1" From 4d712b310daab3c3017fcdaa300627167cab9cc7 Mon Sep 17 00:00:00 2001 From: jacqui Date: Fri, 31 May 2024 11:03:01 +0300 Subject: [PATCH 7/7] Updates ruby version --- .github/workflows/branch.yml | 2 +- .github/workflows/main.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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