Skip to content

Commit

Permalink
Update project
Browse files Browse the repository at this point in the history
  • Loading branch information
michaelbel committed Mar 3, 2023
1 parent 69e7270 commit 127ab6e
Show file tree
Hide file tree
Showing 13 changed files with 22 additions and 17 deletions.
2 changes: 1 addition & 1 deletion app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ android {
}

composeOptions {
kotlinCompilerExtensionVersion = libs.versions.kotlin.compiler.extension.get()
kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get()
}

lint {
Expand Down
1 change: 1 addition & 0 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ plugins {
alias(libs.plugins.library) apply false
alias(libs.plugins.test) apply false
alias(libs.plugins.kotlin) apply false
alias(libs.plugins.kotlin.ksp) apply false
alias(libs.plugins.firebase.appdistribution) apply false
alias(libs.plugins.firebase.crashlytics) apply false
alias(libs.plugins.google.services) apply false
Expand Down
2 changes: 1 addition & 1 deletion core/common/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ android {
}

composeOptions {
kotlinCompilerExtensionVersion = libs.versions.kotlin.compiler.extension.get()
kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get()
}

lint {
Expand Down
3 changes: 2 additions & 1 deletion core/domain/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
plugins {
id("movies-android-library")
id("movies-android-hilt")
id("com.google.devtools.ksp")
}

android {
Expand Down Expand Up @@ -45,5 +46,5 @@ dependencies {
api(libs.androidx.hilt.work)
kapt(libs.androidx.hilt.compiler)
api(libs.androidx.work.runtime.ktx)
kapt(libs.androidx.room.compiler)
ksp(libs.androidx.room.compiler)
}
2 changes: 1 addition & 1 deletion core/ui/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ android {
}

composeOptions {
kotlinCompilerExtensionVersion = libs.versions.kotlin.compiler.extension.get()
kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get()
}

lint {
Expand Down
2 changes: 1 addition & 1 deletion feature/details-impl/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ android {
}

composeOptions {
kotlinCompilerExtensionVersion = libs.versions.kotlin.compiler.extension.get()
kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get()
}

lint {
Expand Down
2 changes: 1 addition & 1 deletion feature/details/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ android {
}

composeOptions {
kotlinCompilerExtensionVersion = libs.versions.kotlin.compiler.extension.get()
kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get()
}

lint {
Expand Down
2 changes: 1 addition & 1 deletion feature/feed-impl/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ android {
}

composeOptions {
kotlinCompilerExtensionVersion = libs.versions.kotlin.compiler.extension.get()
kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get()
}

lint {
Expand Down
2 changes: 1 addition & 1 deletion feature/feed/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ android {
}

composeOptions {
kotlinCompilerExtensionVersion = libs.versions.kotlin.compiler.extension.get()
kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get()
}

lint {
Expand Down
2 changes: 1 addition & 1 deletion feature/settings-impl/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ android {
}

composeOptions {
kotlinCompilerExtensionVersion = libs.versions.kotlin.compiler.extension.get()
kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get()
}

lint {
Expand Down
2 changes: 1 addition & 1 deletion feature/settings/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ android {
}

composeOptions {
kotlinCompilerExtensionVersion = libs.versions.kotlin.compiler.extension.get()
kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get()
}

lint {
Expand Down
8 changes: 5 additions & 3 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,14 @@ compile-sdk = "33"
# @keep
target-sdk = "33"
# @pin
gradle = "7.4.1"
gradle = "7.4.2"
# @pin update when updating compose compiler
kotlin = "1.8.0"
kotlin = "1.8.10"
kotlin-ksp = "1.8.10-1.0.9"
kotlin-coroutines = "1.6.4"
kotlin-serialization = "1.4.1"
# @pin update when updating kotlin
kotlin-compiler-extension = "1.4.0"
compose-compiler = "1.4.3"
detekt = "1.22.0"
spotless = "6.15.0"
google-services = "4.3.15"
Expand Down Expand Up @@ -191,6 +192,7 @@ room = [

[plugins]
kotlin = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
kotlin-ksp = { id = "com.google.devtools.ksp", version.ref = "kotlin-ksp" }
kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
google-services = { id = "com.google.gms.google-services", version.ref = "google-services" }
firebase-appdistribution = { id = "com.google.firebase.appdistribution", version.ref = "firebase-appdistribution" }
Expand Down
9 changes: 5 additions & 4 deletions readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ TMDB_API_KEY=your_own_tmdb_api_key
- [x] [Clean Architecture](https://d.android.com/topic/architecture)
- [x] [TMDB API](https://developers.themoviedb.org/3/getting-started)
- [x] KTS Gradle Files
- [x] Gradle Plugin 7.4.1
- [x] Gradle Plugin 7.4.2
- [x] Gradle Version Catalog
- [x] MinSDK 21
- [x] TargetSDK 33
Expand All @@ -41,8 +41,9 @@ TMDB_API_KEY=your_own_tmdb_api_key
- [x] Dark Theme
- [x] Dynamic Colors
- [x] [Themed App Icon](https://d.android.com/develop/ui/views/launch/icon_design_adaptive)
- [x] 100% Kotlin 1.8.0
- [x] 100% Jetpack Compose 1.3.1, No XML
- [x] 100% Kotlin 1.8.10
- [x] 100% Jetpack Compose 1.4.3
- [x] Kotlin Symbol Processing API 1.8.10-1.0.9
- [x] [Accompanist](https://github.com/google/accompanist) 0.28.0
- [x] [Compose PreviewParameterProvider](https://d.android.com/jetpack/compose/tooling#previewparameter)
- [x] [Downloadable Fonts](https://d.android.com/develop/ui/views/text-and-emoji/downloadable-fonts)
Expand All @@ -57,7 +58,7 @@ TMDB_API_KEY=your_own_tmdb_api_key
- [x] [DataStore](https://d.android.com/datastore) 1.0.0
- [x] [Startup](https://d.android.com/jetpack/androidx/releases/startup) 1.1.1
- [x] [Navigation](https://d.android.com/guide/navigation) 2.5.3
- [x] [Paging](https://d.android.com/topic/libraries/architecture/paging/v3-overview) (RemoteMediator & PagingSource)
- [x] [Paging](https://d.android.com/topic/libraries/architecture/paging/v3-overview) (RemoteMediator & PagingSource) 1.0.0-alpha18
- [x] [ConstraintLayout](https://d.android.com/develop/ui/views/layout/constraint-layout)
- [x] [OkHttp](https://github.com/square/okhttp) 4.10.0
- [x] [Retrofit](https://github.com/square/retrofit) 2.9.0
Expand Down

0 comments on commit 127ab6e

Please sign in to comment.