Skip to content

Commit da3dc8e

Browse files
committed
ref: dependencies and cleanup
1 parent 34bc04e commit da3dc8e

File tree

10 files changed

+11
-257
lines changed

10 files changed

+11
-257
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ The purpose of this repo is to follow up Clean Architecture principles by bringi
55

66
## Project Status
77

8-
- **Last Update 2024.08**
8+
- **Last Update: 2024.08**
99
- Migrated to Kotlin 2.0.
1010
- Migrated to Jetpack Compose.
1111
- Bug Fixes.
@@ -69,7 +69,7 @@ Refer to the issues section: https://github.com/android10/Android-CleanArchitect
6969

7070
## License
7171

72-
Copyright 2022 Fernando Cejas
72+
Copyright 2024 Fernando Cejas
7373

7474
Licensed under the Apache License, Version 2.0 (the "License");
7575
you may not use this file except in compliance with the License.

app/build.gradle.kts

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
11
@file:Suppress("UnstableApiUsage")
22

3-
import org.jetbrains.kotlin.config.JvmTarget
3+
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
44

55

66
class AppConfig {
77
val id = "com.fernandocejas.sample"
8-
val versionCode = 1
9-
val versionName = "1.0"
8+
val versionCode = 2
9+
val versionName = "2.0"
1010

1111
val compileSdk = libs.versions.compileSdk.get().toInt()
1212
val minSdk = libs.versions.minSdk.get().toInt()
1313
val targetSdk = libs.versions.targetSdk.get().toInt()
1414

15+
val jvmTarget = JvmTarget.JVM_17
1516
val javaVersion = JavaVersion.VERSION_17
1617
val testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
1718
}
@@ -20,14 +21,13 @@ plugins {
2021
alias(libs.plugins.android.application)
2122
alias(libs.plugins.kotlin.android)
2223
// alias(libs.plugins.kotlin.compose.compiler)
23-
alias(libs.plugins.kotlin.kasp)
24+
alias(libs.plugins.kotlin.ksp)
2425
alias(libs.plugins.kotlin.parcelize)
2526
}
2627

2728
val appConfig = AppConfig()
2829

2930
android {
30-
3131
namespace = appConfig.id
3232
compileSdk = appConfig.compileSdk
3333

@@ -61,11 +61,9 @@ android {
6161
}
6262
}
6363

64-
// https://kotlinlang.org/docs/gradle-configure-project.html#gradle-java-toolchains-support
6564
kotlin {
66-
// jvmToolchain(appConfig.javaVersion.toString().toInt())
6765
compilerOptions {
68-
// jvmTarget.set(JvmTarget.JVM_17)
66+
jvmTarget.set(appConfig.jvmTarget)
6967
}
7068
}
7169

@@ -80,8 +78,6 @@ dependencies {
8078
implementation(libs.kotlinx.coroutines.android)
8179
implementation(libs.koin.android)
8280
implementation(libs.android.appcompat)
83-
implementation(libs.material)
84-
implementation(libs.androidx.annotation)
8581
// implementation(libs.glide)
8682
implementation(libs.converter.gson)
8783

app/src/main/res/layout/activity_layout.xml

Lines changed: 0 additions & 19 deletions
This file was deleted.

app/src/main/res/layout/fragment_login.xml

Lines changed: 0 additions & 4 deletions
This file was deleted.

app/src/main/res/layout/fragment_movie_details.xml

Lines changed: 0 additions & 109 deletions
This file was deleted.

app/src/main/res/layout/fragment_movies.xml

Lines changed: 0 additions & 26 deletions
This file was deleted.

app/src/main/res/layout/row_movie.xml

Lines changed: 0 additions & 28 deletions
This file was deleted.

app/src/main/res/layout/toolbar.xml

Lines changed: 0 additions & 47 deletions
This file was deleted.

build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ plugins {
66
* see Applying external plugins with same version to subprojects.
77
*/
88
alias(libs.plugins.android.application) apply false
9-
alias(libs.plugins.kotlin.kasp) apply false
9+
alias(libs.plugins.kotlin.ksp) apply false
1010
alias(libs.plugins.kotlin.android) apply false
1111
// alias(libs.plugins.kotlin.compose.compiler) apply false
1212
alias(libs.plugins.kotlin.parcelize) apply false

gradle/libs.versions.toml

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,13 @@ targetSdk = "34"
77
kotlin = "2.0.10"
88
kotlinCoroutines = "1.7.3"
99
# android --------
10-
ksp = "2.0.0-1.0.21"
10+
ksp = "2.0.10-1.0.24"
1111
appCompat = "1.7.0"
12-
materialDesign = "1.2.1"
13-
composeBom = "2024.06.00"
14-
activityCompose = "1.9.1"
1512
liveData = "1.6.8"
1613
lifecycleCompiler = "2.8.4"
1714
constraintlayout = "2.1.4"
1815
lifecycleExtensions = "2.2.0"
1916
koinAndroid = "3.4.3"
20-
recyclerview = "1.3.2"
21-
cardview = "1.0.0"
22-
materialDesignLegacy = "1.12.0"
2317
annotation = "1.8.2"
2418
glide = "4.15.1"
2519
converterGson = "2.9.0"
@@ -49,10 +43,7 @@ kotlinx-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutine
4943
android-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "appCompat" }
5044
androidx-constraintlayout = { module = "androidx.constraintlayout:constraintlayout", version.ref = "constraintlayout" }
5145
androidx-lifecycle-extensions = { module = "androidx.lifecycle:lifecycle-extensions", version.ref = "lifecycleExtensions" }
52-
androidx-recyclerview = { module = "androidx.recyclerview:recyclerview", version.ref = "recyclerview" }
5346
koin-android = { module = "io.insert-koin:koin-android", version.ref = "koinAndroid" }
54-
androidx-cardview = { module = "androidx.cardview:cardview", version.ref = "cardview" }
55-
material = { module = "com.google.android.material:material", version.ref = "materialDesignLegacy" }
5647
androidx-annotation = { module = "androidx.annotation:annotation", version.ref = "annotation" }
5748
glide = { module = "com.github.bumptech.glide:glide", version.ref = "glide" }
5849
converter-gson = { module = "com.squareup.retrofit2:converter-gson", version.ref = "converterGson" }
@@ -78,6 +69,6 @@ leakcanary-android = { module = "com.squareup.leakcanary:leakcanary-android", ve
7869
[plugins]
7970
android-application = { id = "com.android.application", version.ref = "androidGradlePlugin" }
8071
kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
81-
kotlin-kasp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
72+
kotlin-ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
8273
kotlin-compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
8374
kotlin-parcelize = { id = "org.jetbrains.kotlin.plugin.parcelize", version.ref = "kotlin" }

0 commit comments

Comments
 (0)