Skip to content

Commit 2fb50a0

Browse files
committedSep 1, 2024
update: version to libs version toml
1 parent d7946c2 commit 2fb50a0

File tree

10 files changed

+183
-46
lines changed

10 files changed

+183
-46
lines changed
 

‎app/build.gradle.kts

+12-12
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
33
plugins {
44
id("com.android.application")
55
id("org.jetbrains.kotlin.android")
6-
id("kotlin-kapt")
6+
id("com.google.devtools.ksp")
77
}
88

99
android {
@@ -85,20 +85,20 @@ dependencies {
8585

8686
implementation(project(DependencyGradle.FROGO_PATH_RECYCLER_VIEW))
8787

88-
implementation(Androidx.appCompat)
89-
implementation(Androidx.constraintLayout)
90-
implementation(Androidx.Core.ktx)
91-
implementation(Androidx.Work.runtime)
92-
implementation(Androidx.Work.runtimeKtx)
93-
implementation(Androidx.Lifecycle.runtimeKtx)
88+
implementation(libs.androidx.appcompat)
89+
implementation(libs.androidx.constraintlayout)
90+
implementation(libs.androidx.core.ktx)
91+
implementation(libs.androidx.work)
92+
implementation(libs.androidx.work.ktx)
93+
implementation(libs.androidx.lifecycle.runtime.ktx)
9494

95-
implementation(Google.material)
95+
implementation(libs.material)
9696

97-
implementation(GitHub.glide)
97+
implementation(libs.github.glide)
9898

99-
implementation(DependencyGradle.FROGO_UI)
100-
implementation(DependencyGradle.FROGO_CONSUME_API)
99+
implementation(libs.frogo.ui)
100+
implementation(libs.frogo.consume.api)
101101

102-
kapt(GitHub.glideCompiler)
102+
ksp(libs.github.glide.compiler)
103103

104104
}

‎app/src/main/java/com/frogobox/apprecycler/sample/kotlin/FrogoRvExtActivity.kt

+6-6
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,16 @@ import com.frogobox.apprecycler.R
1010
import com.frogobox.apprecycler.core.BaseActivity
1111
import com.frogobox.apprecycler.databinding.ActivityFrogoRvExtBinding
1212
import com.frogobox.coreapi.ConsumeApiResponse
13-
import com.frogobox.coreapi.news.NewsConstant
14-
import com.frogobox.coreapi.news.NewsUrl
15-
import com.frogobox.coreapi.news.model.Article
16-
import com.frogobox.coreapi.news.response.ArticleResponse
1713
import com.frogobox.apprecycler.util.FLog
14+
import com.frogobox.coreutil.news.NewsConstant
15+
import com.frogobox.coreutil.news.NewsUrl
16+
import com.frogobox.coreutil.news.model.Article
17+
import com.frogobox.coreutil.news.response.ArticleResponse
1818
import com.frogobox.recycler.core.FrogoRecyclerNotifyListener
1919
import com.frogobox.recycler.core.IFrogoViewAdapter
2020
import com.frogobox.recycler.ext.injector
21-
import com.frogobox.sdk.ext.glideLoad
2221
import com.frogobox.sdk.ext.gone
22+
import com.frogobox.sdk.ext.setImageExt
2323
import com.frogobox.sdk.ext.usingChuck
2424
import com.frogobox.sdk.ext.visible
2525

@@ -88,7 +88,7 @@ class FrogoRvExtActivity : BaseActivity<ActivityFrogoRvExtBinding>() {
8888
view.findViewById<TextView>(R.id.frogo_rv_list_type_8_tv_subtitle).text =
8989
data.description
9090
view.findViewById<ImageView>(R.id.frogo_rv_list_type_8_civ_poster)
91-
.glideLoad(data.urlToImage)
91+
.setImageExt(data.urlToImage)
9292
}
9393

9494
override fun onItemClicked(

‎app/src/main/java/com/frogobox/apprecycler/sample/kotlin/noadapter/progress/KotlinProgressActivity.kt

+4-4
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ import com.frogobox.apprecycler.BuildConfig
99
import com.frogobox.apprecycler.core.BaseActivity
1010
import com.frogobox.apprecycler.databinding.ActivityKotlinProgressBinding
1111
import com.frogobox.coreapi.ConsumeApiResponse
12-
import com.frogobox.coreapi.news.NewsConstant
13-
import com.frogobox.coreapi.news.NewsUrl
14-
import com.frogobox.coreapi.news.model.Article
15-
import com.frogobox.coreapi.news.response.ArticleResponse
12+
import com.frogobox.coreutil.news.NewsConstant
13+
import com.frogobox.coreutil.news.NewsUrl
14+
import com.frogobox.coreutil.news.model.Article
15+
import com.frogobox.coreutil.news.response.ArticleResponse
1616
import com.frogobox.recycler.core.FrogoRecyclerNotifyListener
1717
import com.frogobox.recycler.core.IFrogoViewAdapter
1818
import com.frogobox.sdk.ext.progressViewHandle

‎app/src/main/java/com/frogobox/apprecycler/sample/kotlin/noadapter/shimmer/KotlinShimmerActivity.kt

+4-4
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ import com.frogobox.apprecycler.BuildConfig
99
import com.frogobox.apprecycler.core.BaseActivity
1010
import com.frogobox.apprecycler.databinding.ActivityKotlinShimmerBinding
1111
import com.frogobox.coreapi.ConsumeApiResponse
12-
import com.frogobox.coreapi.news.NewsConstant
13-
import com.frogobox.coreapi.news.NewsUrl
14-
import com.frogobox.coreapi.news.model.Article
15-
import com.frogobox.coreapi.news.response.ArticleResponse
12+
import com.frogobox.coreutil.news.NewsConstant
13+
import com.frogobox.coreutil.news.NewsUrl
14+
import com.frogobox.coreutil.news.model.Article
15+
import com.frogobox.coreutil.news.response.ArticleResponse
1616
import com.frogobox.recycler.core.FrogoRecyclerNotifyListener
1717
import com.frogobox.recycler.core.IFrogoViewAdapter
1818
import com.frogobox.ui.R

‎app/src/main/java/com/frogobox/apprecycler/sample/kotlin/usingadapter/nested/KotlinNestedActivity.kt

+6-6
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ import com.frogobox.apprecycler.BuildConfig
1111
import com.frogobox.apprecycler.core.BaseActivity
1212
import com.frogobox.apprecycler.databinding.ActivityFrogoRvGridBinding
1313
import com.frogobox.coreapi.ConsumeApiResponse
14-
import com.frogobox.coreapi.news.NewsConstant
15-
import com.frogobox.coreapi.news.NewsUrl
16-
import com.frogobox.coreapi.news.model.Article
17-
import com.frogobox.coreapi.news.response.ArticleResponse
14+
import com.frogobox.coreutil.news.NewsConstant
15+
import com.frogobox.coreutil.news.NewsUrl
16+
import com.frogobox.coreutil.news.model.Article
17+
import com.frogobox.coreutil.news.response.ArticleResponse
1818
import com.frogobox.recycler.core.*
19-
import com.frogobox.sdk.ext.glideLoad
19+
import com.frogobox.sdk.ext.setImageExt
2020
import com.frogobox.ui.R
2121

2222
class KotlinNestedActivity : BaseActivity<ActivityFrogoRvGridBinding>() {
@@ -140,7 +140,7 @@ class KotlinNestedActivity : BaseActivity<ActivityFrogoRvGridBinding>() {
140140
view.findViewById<TextView>(R.id.frogo_rv_grid_type_3_tv_subtitle)
141141
val tv_desc = view.findViewById<TextView>(R.id.frogo_rv_grid_type_3_tv_desc)
142142

143-
iv.glideLoad(data.urlToImage)
143+
iv.setImageExt(data.urlToImage)
144144
tv_title.text = data.title
145145
tv_sub.text = data.author
146146
tv_desc.text = data.description

‎build.gradle.kts

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22
plugins {
3-
id("com.android.application") version "8.1.2" apply false
4-
id("com.android.library") version "8.1.2" apply false
3+
id("com.android.application") version "8.1.4" apply false
4+
id("com.android.library") version "8.1.4" apply false
55
id("org.jetbrains.kotlin.android") version DependencyGradle.KOTLIN_VERSION apply false
6+
id("com.google.devtools.ksp") version "1.9.23-1.0.19" apply false
67
}
78

89
tasks.register("clean", Delete::class) {

‎buildSrc/build.gradle.kts

-3
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,4 @@ repositories {
1111

1212
dependencies{
1313

14-
// library frogo-build-src
15-
implementation("com.github.frogobox:open-build-src:3.0.2")
16-
1714
}

‎buildSrc/src/main/kotlin/DependencyGradle.kt

+1-7
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,8 @@
1414
object DependencyGradle {
1515

1616
// dependencies version
17-
const val KOTLIN_VERSION = Version.JetBrains.kotlin
17+
const val KOTLIN_VERSION = "1.9.23"
1818

1919
const val FROGO_PATH_RECYCLER_VIEW = ":frogorecyclerview"
2020

21-
const val FROGO_UI_VERSION = "1.1.5"
22-
const val FROGO_CONSUME_API_VERSION = "2.4.5"
23-
24-
const val FROGO_UI = "com.github.frogobox:frogo-ui:$FROGO_UI_VERSION"
25-
const val FROGO_CONSUME_API = "com.github.frogobox:frogo-consume-api:$FROGO_CONSUME_API_VERSION"
26-
2721
}

‎frogorecyclerview/build.gradle.kts

+2-2
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,8 @@ android {
6262
}
6363

6464
dependencies {
65-
api(Androidx.recyclerview)
66-
api("com.google.android.flexbox:flexbox:3.0.0")
65+
api(libs.androidx.recyclerview)
66+
api(libs.flexbox)
6767
}
6868

6969
afterEvaluate {

‎gradle/libs.versions.toml

+145
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,145 @@
1+
[versions]
2+
agp = "8.5.1"
3+
kotlin = "1.9.23"
4+
ksp = "1.9.23-1.0.19"
5+
6+
coreKtx = "1.13.1"
7+
appcompat = "1.7.0"
8+
activity = "1.9.1"
9+
fragment = "1.8.2"
10+
constraintlayout = "2.1.4"
11+
liveCycle = "2.8.4"
12+
viewPager2 = "1.1.0"
13+
preference = "1.2.1"
14+
roomKtx = "2.6.1"
15+
work = "2.9.1"
16+
recyclerview = "1.3.2"
17+
18+
# Compose Version
19+
composeCompiler = "1.5.12" # https://developer.android.com/jetpack/androidx/releases/compose
20+
composeAnimation = "1.6.6"# https://developer.android.com/jetpack/androidx/releases/compose
21+
composeActivity = "1.9.1" # https://androidx.tech/artifacts/activity/activity-compose/
22+
compose = "1.6.8" # https://developer.android.com/jetpack/androidx/releases/compose
23+
composeMaterial = "1.6.8" # https://developer.android.com/jetpack/androidx/releases/compose
24+
composeFoundation = "1.6.6" # https://developer.android.com/jetpack/androidx/releases/compose
25+
composeMaterial3 = "1.2.1" # https://developer.android.com/jetpack/androidx/releases/compose
26+
composeNavigation = "2.7.7" # https://androidx.tech/artifacts/navigation/navigation-compose/
27+
composeHiltNavigation = "1.2.0" # https://developer.android.com/jetpack/androidx/releases/hilt
28+
29+
30+
material = "1.12.0"
31+
gson = "2.10.1"
32+
33+
okhttp = "4.12.0"
34+
retrofit = "2.11.0"
35+
36+
rxandroid3 = "3.0.2"
37+
rxjava3 = "3.1.8"
38+
39+
chucker = "4.0.0"
40+
glide = "4.16.0"
41+
customactivityoncrash = "2.4.0"
42+
circleimageview = "3.1.0"
43+
44+
flexbox = "3.0.0"
45+
46+
47+
koin = "3.5.6"
48+
49+
frogorecylerview = "4.4.1"
50+
frogosdk = "2.2.7"
51+
frogoui = "2.0.3"
52+
frogoConsumeApi = "2.5.4"
53+
54+
junit = "4.13.2"
55+
junitVersion = "1.2.1"
56+
espressoCore = "3.6.1"
57+
58+
[libraries]
59+
# Android Kit
60+
androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
61+
androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" }
62+
androidx-activity-ktx = { group = "androidx.activity", name = "activity-ktx", version.ref = "activity" }
63+
androidx-fragment-ktx = { group = "androidx.fragment", name = "fragment-ktx", version.ref = "fragment" }
64+
androidx-work = { group = "androidx.work", name = "work-runtime", version.ref = "work" }
65+
androidx-work-ktx = { group = "androidx.work", name = "work-runtime-ktx", version.ref = "work" }
66+
67+
androidx-recyclerview = { group = "androidx.recyclerview", name = "recyclerview", version.ref = "recyclerview" }
68+
69+
androidx-constraintlayout = { group = "androidx.constraintlayout", name = "constraintlayout", version.ref = "constraintlayout" }
70+
androidx-lifecycle-runtime-ktx = { group = "androidx.lifecycle", name = "lifecycle-runtime-ktx", version.ref = "liveCycle" }
71+
androidx-lifecycle-viewmodel-ktx = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-ktx", version.ref = "liveCycle" }
72+
androidx-lifecycle-livedata-ktx = { group = "androidx.lifecycle", name = "lifecycle-livedata-ktx", version.ref = "liveCycle" }
73+
androidx-lifecycle-compiler = { group = "androidx.lifecycle", name = "lifecycle-compiler", version.ref = "liveCycle" }
74+
75+
androidx-viewpager2 = { group = "androidx.viewpager2", name = "viewpager2", version.ref = "viewPager2" }
76+
androidx-preference = { group = "androidx.preference", name = "preference", version.ref = "preference" }
77+
78+
androidx-room-runtime = { group = "androidx.room", name = "room-runtime", version.ref = "roomKtx" }
79+
androidx-room-ktx = { group = "androidx.room", name = "room-ktx", version.ref = "roomKtx" }
80+
androidx-room-rxjava3 = { group = "androidx.room", name = "room-rxjava3", version.ref = "roomKtx" }
81+
androidx-room-compiler = { group = "androidx.room", name = "room-compiler", version.ref = "roomKtx" }
82+
83+
androidx-activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "composeActivity"}
84+
androidx-compose-material = { group = "androidx.compose.material", name = "material", version.ref = "composeMaterial"}
85+
androidx-compose-material3 = { group = "androidx.compose.material3", name = "material3", version.ref = "composeMaterial3"}
86+
androidx-compose-animation = { group = "androidx.compose.animation", name = "animation", version.ref = "compose"}
87+
androidx-compose-ui = { group = "androidx.compose.ui", name = "ui", version.ref = "compose"}
88+
androidx-compose-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling", version.ref = "compose"}
89+
androidx-compose-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview", version.ref = "compose"}
90+
androidx-compose-ui-test-manifest = { group = "androidx.compose.ui", name = "ui-test-manifest", version.ref = "compose"}
91+
92+
flexbox = { group = "com.google.android.flexbox", name = "flexbox", version.ref = "flexbox" }
93+
material = { group = "com.google.android.material", name = "material", version.ref = "material" }
94+
gson = { group = "com.google.code.gson", name = "gson", version.ref = "gson" }
95+
96+
# --------------------------------------------------------------------------------------------------
97+
# Test Library
98+
99+
androidx-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espressoCore" }
100+
androidx-junit = { group = "androidx.test.ext", name = "junit", version.ref = "junitVersion" }
101+
junit = { group = "junit", name = "junit", version.ref = "junit" }
102+
103+
# --------------------------------------------------------------------------------------------------
104+
# Library
105+
106+
square-okhttp = { group = "com.squareup.okhttp3", name = "okhttp", version.ref = "okhttp" }
107+
square-logging-interceptor = { group = "com.squareup.okhttp3", name = "logging-interceptor", version.ref = "okhttp" }
108+
109+
square-retrofit = { group = "com.squareup.retrofit2", name = "retrofit", version.ref = "retrofit" }
110+
square-retrofit-converter-gson = { group = "com.squareup.retrofit2", name = "converter-gson", version.ref = "retrofit" }
111+
square-retrofit-adapter-rxjava3 = { group = "com.squareup.retrofit2", name = "adapter-rxjava3", version.ref = "retrofit" }
112+
113+
reactivex-rxjava3 = { group = "io.reactivex.rxjava3", name = "rxjava", version.ref = "rxjava3" }
114+
reactivex-rxandroid3 = { group = "io.reactivex.rxjava3", name = "rxandroid", version.ref = "rxandroid3" }
115+
116+
github-chucker = { group = "com.github.chuckerteam.chucker", name = "library", version.ref = "chucker" }
117+
github-glide = { group = "com.github.bumptech.glide", name = "glide", version.ref = "glide" }
118+
github-glide-compiler = { group = "com.github.bumptech.glide", name = "ksp", version.ref = "glide" }
119+
github-customactivityoncrash = { group = "cat.ereza", name = "customactivityoncrash", version.ref = "customactivityoncrash" }
120+
github-circleimageview = { group = "de.hdodenhof", name = "circleimageview", version.ref = "circleimageview" }
121+
122+
koin-core = { group = "io.insert-koin", name = "koin-core", version.ref = "koin" }
123+
koin-android = { group = "io.insert-koin", name = "koin-android", version.ref = "koin" }
124+
koin-android-compat = { group = "io.insert-koin", name = "koin-android-compat", version.ref = "koin" }
125+
koin-androidx-workmanager = { group = "io.insert-koin", name = "koin-androidx-workmanager", version.ref = "koin" }
126+
127+
frogo-sdk = { group = "com.github.frogobox", name = "frogo-sdk", version.ref = "frogosdk" }
128+
frogo-sdk-core = { group = "com.github.frogobox.frogo-sdk", name = "core-sdk", version.ref = "frogosdk" }
129+
130+
frogo-ui = { group = "com.github.frogobox", name = "frogo-ui", version.ref = "frogoui" }
131+
frogo-ui-core = { group = "com.github.frogobox.frogo-ui", name = "core-ui", version.ref = "frogoui" }
132+
133+
frogo-consume-api = { group = "com.github.frogobox", name = "frogo-consume-api", version.ref = "frogoConsumeApi" }
134+
135+
frogo-recyclerview = { group = "com.github.amirisback", name = "frogo-recycler-view", version.ref = "frogorecylerview" }
136+
137+
# --------------------------------------------------------------------------------------------------
138+
139+
140+
[plugins]
141+
#android-application = { id = "com.android.application", version.ref = "agp" }
142+
#android.library = { id = "com.android.library", version.ref = "agp"}
143+
#jetbrains-kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
144+
#jetbrains-kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin"}
145+
#google-devtools-ksp = { id = "org.google.devtools.ksp", version.ref = "ksp"}

0 commit comments

Comments
 (0)
Failed to load comments.