Skip to content

Commit

Permalink
Kotlin, AGP, Compose, compile SDK and libs update (#51)
Browse files Browse the repository at this point in the history
## Context
- AGP `7.4.1` -> `7.4.1`
- Kotlin `1.8.10` -> `1.9.0`
- Compose compiler `1.4.2` -> `1.5.2`
- Compose BOM `2023.01.00` -> `2024.02.01`
- compile SDK `33` -> `34`
- Several other dependencies
  • Loading branch information
cmorigaki authored Feb 23, 2024
1 parent 200d9dd commit 7b60d2a
Show file tree
Hide file tree
Showing 24 changed files with 105 additions and 69 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/pr_workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,16 @@ on:
jobs:
test:
name: Run Static Analysis + Unit Tests
runs-on: ubuntu-18.04
runs-on: ubuntu-latest

steps:
- name: Checkout repository
uses: actions/checkout@v2

- name: set up JDK 11
- name: set up JDK 17
uses: actions/setup-java@v1
with:
java-version: 11
java-version: 17

- name: Decrypting api-properties
run: gpg --quiet --batch --yes --decrypt --passphrase "${{ secrets.API_PROPERTIES_PASSPHRASE }}" project-config/api-properties/api.properties.asc > project-config/api-properties/api.properties
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/release_workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,16 @@ on:
jobs:
test:
name: Release - Run Unit Tests
runs-on: ubuntu-18.04
runs-on: ubuntu-latest

steps:
- name: Checkout repository
uses: actions/checkout@v2

- name: set up JDK 11
- name: set up JDK 17
uses: actions/setup-java@v1
with:
java-version: 11
java-version: 17

- name: Decrypting api-properties
run: gpg --quiet --batch --yes --decrypt --passphrase "${{ secrets.API_PROPERTIES_PASSPHRASE }}" project-config/api-properties/api.properties.asc > project-config/api-properties/api.properties
Expand All @@ -27,15 +27,15 @@ jobs:

apk:
name: Generate APK
runs-on: ubuntu-18.04
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v1

- name: set up JDK 11
- name: set up JDK 17
uses: actions/setup-java@v1
with:
java-version: 11
java-version: 17

- name: Build debug APK
run: ./gradlew assembleDebug --stacktrace
Expand Down
2 changes: 1 addition & 1 deletion .idea/compiler.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 10 additions & 0 deletions .idea/deploymentTargetDropDown.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/kotlinc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 10 additions & 0 deletions .idea/migrations.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ dependencies {
implementation libs.kotlin.stdlib
implementation libs.coroutines.core

implementation platform(libs.koin.bom)
implementation libs.koin.core
implementation libs.koin.android

Expand Down
9 changes: 1 addition & 8 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ plugins {
alias(libs.plugins.android.library) apply false
alias(libs.plugins.kotlin.jvm) apply false
alias(libs.plugins.kotlin.android) apply false
alias(libs.plugins.kotlin.kapt)
alias(libs.plugins.kotlin.ksp) apply false
alias(libs.plugins.easylauncher) apply false
alias(libs.plugins.gradle.deps.update)
}
Expand All @@ -20,13 +20,6 @@ apply from: "project-config/dependencies-checker/dependencies-checker.gradle"
// Usage ./gradlew jacocoTestReport
apply from: "$rootDir/quality/test-coverage-setup.gradle"

allprojects {
repositories {
mavenCentral()
google()
}
}

task installGitHooks(type: Exec) {
group 'Quality'
description 'Installs the git hooks'
Expand Down
1 change: 1 addition & 0 deletions core-android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ android {
dependencies {
implementation libs.kotlin.stdlib

implementation platform(libs.koin.bom)
implementation libs.koin.core

implementation libs.retrofit
Expand Down
5 changes: 4 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,7 @@ android.useAndroidX=true
# Kotlin code style for this project: "official" or "obsolete":
kotlin.code.style=official
# Temporary solution for easylauncher plugin
android.disableResourceValidation=true
android.disableResourceValidation=true
android.defaults.buildfeatures.buildconfig=true
android.nonTransitiveRClass=false
android.nonFinalResIds=false
54 changes: 28 additions & 26 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,59 +1,61 @@
[versions]
gradleplugin = "7.4.1"
kotlin = "1.8.10"
gradleplugin = "8.2.2"
kotlin = "1.9.0"
ksp = "1.9.0-1.0.13"
minSdk = "23"
compileSdk = "33"
compose = "1.4.2"
compileSdk = "34"
compose = "1.5.2"

[libraries]
# Kotlin
kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin" }
kotlin-jdk = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8", version.ref = "kotlin" }
coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version = "1.6.4" }
kotlin-result = { module = "com.michael-bull.kotlin-result:kotlin-result", version = "1.1.16" }
coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version = "1.8.0" }
kotlin-result = { module = "com.michael-bull.kotlin-result:kotlin-result", version = "1.1.18" }

# Debug
leak-canary = { module = "com.squareup.leakcanary:leakcanary-android", version = "2.10" }
leak-canary = { module = "com.squareup.leakcanary:leakcanary-android", version = "2.13" }

# Compose
compose-bom = { module = "androidx.compose:compose-bom", version = "2023.01.00" }
compose-bom = { module = "androidx.compose:compose-bom", version = "2024.02.01" }
compose-ui = { module = "androidx.compose.ui:ui" }
compose-foundation = { module = "androidx.compose.foundation:foundation" }
compose-material = { module = "androidx.compose.material:material" }
compose-materialIcons = { module = "androidx.compose.material:material-icons-core" }
compose-materialIconsExt = { module = "androidx.compose.material:material-icons-extended" }
compose-tooling = { module = "androidx.compose.ui:ui-tooling" }
compose-activity = { module = "androidx.activity:activity-compose", version = "1.6.1" }
compose-swipeRefresh = { module = "com.google.accompanist:accompanist-swiperefresh", version = "0.28.0" }
compose-activity = { module = "androidx.activity:activity-compose", version = "1.8.2" }
compose-swipeRefresh = { module = "com.google.accompanist:accompanist-swiperefresh", version = "0.34.0" }
compose-collapsingToolbar = { module = "me.onebone:toolbar-compose", version = "2.3.5" }

# Network related libraries
retrofit = { module = "com.squareup.retrofit2:retrofit", version = "2.9.0" }
okhttp = { module = "com.squareup.okhttp3:okhttp", version = "4.10.0" }
okhttp = { module = "com.squareup.okhttp3:okhttp", version = "4.12.0" }
moshi-converter = { module = "com.squareup.retrofit2:converter-moshi", version = "2.9.0" }
moshi-codegen = { module = "com.squareup.moshi:moshi-kotlin-codegen", version = "1.14.0" }
moshi = { module = "com.squareup.moshi:moshi", version = "1.14.0" }
moshi-codegen = { module = "com.squareup.moshi:moshi-kotlin-codegen", version = "1.15.1" }
moshi = { module = "com.squareup.moshi:moshi", version = "1.15.1" }

# Android components
appCompat = { module = "androidx.appcompat:appcompat", version = "1.6.1" }
viewmodel = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version = "2.4.1" }
fragment = { module = "androidx.fragment:fragment-ktx", version = "1.5.4" }
material = { module = "com.google.android.material:material", version = "1.8.0" }
viewmodel = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version = "2.7.0" }
fragment = { module = "androidx.fragment:fragment-ktx", version = "1.6.2" }
material = { module = "com.google.android.material:material", version = "1.11.0" }

# Android utilities
play-core = { module = "com.google.android.play:core", version = "1.10.3" } # For in-App update
play-core-extensions = { module = "com.google.android.play:core-ktx", version = "1.8.1" }

# DI
koin-core = { module = "io.insert-koin:koin-core", version = "3.3.3" }
koin-android = { module = "io.insert-koin:koin-android", version = "3.3.3" }
koin-bom = { module = "io.insert-koin:koin-bom", version = "3.5.3" }
koin-core = { module = "io.insert-koin:koin-core" }
koin-android = { module = "io.insert-koin:koin-android" }

# Image download library
coil = { module = "io.coil-kt:coil", version = "2.2.2" }
coil-compose = { module = "io.coil-kt:coil-compose", version = "2.2.2" }
coil = { module = "io.coil-kt:coil", version = "2.5.0" }
coil-compose = { module = "io.coil-kt:coil-compose", version = "2.5.0" }

# Crash reporting library
sentry = { module = "io.sentry:sentry-android", version = "6.13.1" }
sentry = { module = "io.sentry:sentry-android", version = "7.4.0" }

# Analytics
amplitude = { module = "com.amplitude:android-sdk", version = "3.35.1" }
Expand All @@ -63,8 +65,8 @@ timber = { module = "com.jakewharton.timber:timber", version = "5.0.1" }

# Testing
junit = { module = "junit:junit", version = "4.13.2"}
mockk = { module = "io.mockk:mockk", version = "1.13.4"}
coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version = "1.6.4"}
mockk = { module = "io.mockk:mockk", version = "1.13.9"}
coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version = "1.8.0"}

[bundles]

Expand All @@ -73,6 +75,6 @@ android-application = { id = "com.android.application", version.ref = "gradleplu
android-library = { id = "com.android.library", version.ref = "gradleplugin" }
kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
kotlin-kapt = { id = "org.jetbrains.kotlin.kapt", version.ref = "kotlin" }
easylauncher = { id = "com.starter.easylauncher", version = "6.1.0" }
gradle-deps-update = { id = "com.github.ben-manes.versions", version = "0.45.0" }
kotlin-ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
easylauncher = { id = "com.starter.easylauncher", version = "6.2.0" }
gradle-deps-update = { id = "com.github.ben-manes.versions", version = "0.51.0" }
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Tue Feb 14 16:12:35 BRT 2023
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
1 change: 1 addition & 0 deletions infrastructure/analytics-amplitude/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ android {
dependencies {
implementation libs.kotlin.stdlib

implementation platform(libs.koin.bom)
implementation libs.koin.core
implementation libs.koin.android

Expand Down
5 changes: 3 additions & 2 deletions infrastructure/configuration/build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
plugins {
alias(libs.plugins.android.library)
alias(libs.plugins.kotlin.android)
alias(libs.plugins.kotlin.kapt)
alias(libs.plugins.kotlin.ksp)
}

android {
Expand All @@ -27,6 +27,7 @@ dependencies {
implementation libs.coroutines.core
implementation libs.kotlin.result

implementation platform(libs.koin.bom)
implementation libs.koin.core

implementation project(ProjectConfig.utilityKotlin)
Expand All @@ -35,5 +36,5 @@ dependencies {
implementation libs.retrofit
implementation libs.moshi.converter
implementation libs.moshi
kapt libs.moshi.codegen
ksp libs.moshi.codegen
}
5 changes: 3 additions & 2 deletions infrastructure/device/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ android {
}

compileOptions {
sourceCompatibility JavaVersion.VERSION_11
targetCompatibility JavaVersion.VERSION_11
sourceCompatibility javaVersion
targetCompatibility javaVersion
}
kotlinOptions {
jvmTarget = jvmTargetVersion
Expand All @@ -25,5 +25,6 @@ dependencies {
implementation libs.kotlin.jdk
implementation libs.coroutines.core

implementation platform(libs.koin.bom)
implementation libs.koin.core
}
1 change: 1 addition & 0 deletions infrastructure/image/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ dependencies {
implementation libs.kotlin.stdlib
implementation libs.coroutines.core

implementation platform(libs.koin.bom)
implementation libs.koin.core

implementation project(ProjectConfig.startup)
Expand Down
1 change: 1 addition & 0 deletions infrastructure/monitoring/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ android {
dependencies {
implementation libs.kotlin.stdlib

implementation platform(libs.koin.bom)
implementation libs.koin.core

implementation libs.timber
Expand Down
1 change: 1 addition & 0 deletions infrastructure/navigation/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ android {
dependencies {
implementation libs.kotlin.stdlib

implementation platform(libs.koin.bom)
implementation libs.koin.core

implementation project(ProjectConfig.coreAndroid)
Expand Down
1 change: 1 addition & 0 deletions infrastructure/startup/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ dependencies {
implementation libs.kotlin.stdlib
implementation libs.coroutines.core

implementation platform(libs.koin.bom)
implementation libs.koin.core

implementation project(ProjectConfig.utilityKotlin)
Expand Down
4 changes: 2 additions & 2 deletions project-config/dependencies.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ext {
jvmTargetVersion = "11"
javaVersion = JavaVersion.VERSION_11
jvmTargetVersion = "17"
javaVersion = JavaVersion.VERSION_17

ProjectConfig = [
utilityKotlin: ":utility:utility-kotlin",
Expand Down
7 changes: 4 additions & 3 deletions project-config/feature-complete-build.gradle
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
apply plugin: "com.android.library"
apply plugin: 'kotlin-android'
apply plugin: 'kotlin-kapt'
apply plugin: 'com.google.devtools.ksp'
//plugins {
// alias(libs.plugins.android.library)
// alias(libs.plugins.kotlin.android)
// alias(libs.plugins.kotlin.kapt)
// alias(libs.plugins.kotlin.ksp)
//}

android {
Expand Down Expand Up @@ -43,13 +43,14 @@ dependencies {
implementation libs.coroutines.core
implementation libs.kotlin.result

implementation platform(libs.koin.bom)
implementation libs.koin.core
implementation libs.koin.android

implementation libs.retrofit
implementation libs.moshi.converter
implementation libs.moshi
kapt libs.moshi.codegen
ksp libs.moshi.codegen

implementation libs.appCompat
implementation libs.viewmodel
Expand Down
Loading

0 comments on commit 7b60d2a

Please sign in to comment.