Skip to content

Commit

Permalink
update: version to libs version toml
Browse files Browse the repository at this point in the history
  • Loading branch information
amirisback committed Sep 1, 2024
1 parent d7946c2 commit 2fb50a0
Show file tree
Hide file tree
Showing 10 changed files with 183 additions and 46 deletions.
24 changes: 12 additions & 12 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
plugins {
id("com.android.application")
id("org.jetbrains.kotlin.android")
id("kotlin-kapt")
id("com.google.devtools.ksp")
}

android {
Expand Down Expand Up @@ -85,20 +85,20 @@ dependencies {

implementation(project(DependencyGradle.FROGO_PATH_RECYCLER_VIEW))

implementation(Androidx.appCompat)
implementation(Androidx.constraintLayout)
implementation(Androidx.Core.ktx)
implementation(Androidx.Work.runtime)
implementation(Androidx.Work.runtimeKtx)
implementation(Androidx.Lifecycle.runtimeKtx)
implementation(libs.androidx.appcompat)
implementation(libs.androidx.constraintlayout)
implementation(libs.androidx.core.ktx)
implementation(libs.androidx.work)
implementation(libs.androidx.work.ktx)
implementation(libs.androidx.lifecycle.runtime.ktx)

implementation(Google.material)
implementation(libs.material)

implementation(GitHub.glide)
implementation(libs.github.glide)

implementation(DependencyGradle.FROGO_UI)
implementation(DependencyGradle.FROGO_CONSUME_API)
implementation(libs.frogo.ui)
implementation(libs.frogo.consume.api)

kapt(GitHub.glideCompiler)
ksp(libs.github.glide.compiler)

}
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,16 @@ import com.frogobox.apprecycler.R
import com.frogobox.apprecycler.core.BaseActivity
import com.frogobox.apprecycler.databinding.ActivityFrogoRvExtBinding
import com.frogobox.coreapi.ConsumeApiResponse
import com.frogobox.coreapi.news.NewsConstant
import com.frogobox.coreapi.news.NewsUrl
import com.frogobox.coreapi.news.model.Article
import com.frogobox.coreapi.news.response.ArticleResponse
import com.frogobox.apprecycler.util.FLog
import com.frogobox.coreutil.news.NewsConstant
import com.frogobox.coreutil.news.NewsUrl
import com.frogobox.coreutil.news.model.Article
import com.frogobox.coreutil.news.response.ArticleResponse
import com.frogobox.recycler.core.FrogoRecyclerNotifyListener
import com.frogobox.recycler.core.IFrogoViewAdapter
import com.frogobox.recycler.ext.injector
import com.frogobox.sdk.ext.glideLoad
import com.frogobox.sdk.ext.gone
import com.frogobox.sdk.ext.setImageExt
import com.frogobox.sdk.ext.usingChuck
import com.frogobox.sdk.ext.visible

Expand Down Expand Up @@ -88,7 +88,7 @@ class FrogoRvExtActivity : BaseActivity<ActivityFrogoRvExtBinding>() {
view.findViewById<TextView>(R.id.frogo_rv_list_type_8_tv_subtitle).text =
data.description
view.findViewById<ImageView>(R.id.frogo_rv_list_type_8_civ_poster)
.glideLoad(data.urlToImage)
.setImageExt(data.urlToImage)
}

override fun onItemClicked(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ import com.frogobox.apprecycler.BuildConfig
import com.frogobox.apprecycler.core.BaseActivity
import com.frogobox.apprecycler.databinding.ActivityKotlinProgressBinding
import com.frogobox.coreapi.ConsumeApiResponse
import com.frogobox.coreapi.news.NewsConstant
import com.frogobox.coreapi.news.NewsUrl
import com.frogobox.coreapi.news.model.Article
import com.frogobox.coreapi.news.response.ArticleResponse
import com.frogobox.coreutil.news.NewsConstant
import com.frogobox.coreutil.news.NewsUrl
import com.frogobox.coreutil.news.model.Article
import com.frogobox.coreutil.news.response.ArticleResponse
import com.frogobox.recycler.core.FrogoRecyclerNotifyListener
import com.frogobox.recycler.core.IFrogoViewAdapter
import com.frogobox.sdk.ext.progressViewHandle
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ import com.frogobox.apprecycler.BuildConfig
import com.frogobox.apprecycler.core.BaseActivity
import com.frogobox.apprecycler.databinding.ActivityKotlinShimmerBinding
import com.frogobox.coreapi.ConsumeApiResponse
import com.frogobox.coreapi.news.NewsConstant
import com.frogobox.coreapi.news.NewsUrl
import com.frogobox.coreapi.news.model.Article
import com.frogobox.coreapi.news.response.ArticleResponse
import com.frogobox.coreutil.news.NewsConstant
import com.frogobox.coreutil.news.NewsUrl
import com.frogobox.coreutil.news.model.Article
import com.frogobox.coreutil.news.response.ArticleResponse
import com.frogobox.recycler.core.FrogoRecyclerNotifyListener
import com.frogobox.recycler.core.IFrogoViewAdapter
import com.frogobox.ui.R
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ import com.frogobox.apprecycler.BuildConfig
import com.frogobox.apprecycler.core.BaseActivity
import com.frogobox.apprecycler.databinding.ActivityFrogoRvGridBinding
import com.frogobox.coreapi.ConsumeApiResponse
import com.frogobox.coreapi.news.NewsConstant
import com.frogobox.coreapi.news.NewsUrl
import com.frogobox.coreapi.news.model.Article
import com.frogobox.coreapi.news.response.ArticleResponse
import com.frogobox.coreutil.news.NewsConstant
import com.frogobox.coreutil.news.NewsUrl
import com.frogobox.coreutil.news.model.Article
import com.frogobox.coreutil.news.response.ArticleResponse
import com.frogobox.recycler.core.*
import com.frogobox.sdk.ext.glideLoad
import com.frogobox.sdk.ext.setImageExt
import com.frogobox.ui.R

class KotlinNestedActivity : BaseActivity<ActivityFrogoRvGridBinding>() {
Expand Down Expand Up @@ -140,7 +140,7 @@ class KotlinNestedActivity : BaseActivity<ActivityFrogoRvGridBinding>() {
view.findViewById<TextView>(R.id.frogo_rv_grid_type_3_tv_subtitle)
val tv_desc = view.findViewById<TextView>(R.id.frogo_rv_grid_type_3_tv_desc)

iv.glideLoad(data.urlToImage)
iv.setImageExt(data.urlToImage)
tv_title.text = data.title
tv_sub.text = data.author
tv_desc.text = data.description
Expand Down
5 changes: 3 additions & 2 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
plugins {
id("com.android.application") version "8.1.2" apply false
id("com.android.library") version "8.1.2" apply false
id("com.android.application") version "8.1.4" apply false
id("com.android.library") version "8.1.4" apply false
id("org.jetbrains.kotlin.android") version DependencyGradle.KOTLIN_VERSION apply false
id("com.google.devtools.ksp") version "1.9.23-1.0.19" apply false
}

tasks.register("clean", Delete::class) {
Expand Down
3 changes: 0 additions & 3 deletions buildSrc/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,4 @@ repositories {

dependencies{

// library frogo-build-src
implementation("com.github.frogobox:open-build-src:3.0.2")

}
8 changes: 1 addition & 7 deletions buildSrc/src/main/kotlin/DependencyGradle.kt
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,8 @@
object DependencyGradle {

// dependencies version
const val KOTLIN_VERSION = Version.JetBrains.kotlin
const val KOTLIN_VERSION = "1.9.23"

const val FROGO_PATH_RECYCLER_VIEW = ":frogorecyclerview"

const val FROGO_UI_VERSION = "1.1.5"
const val FROGO_CONSUME_API_VERSION = "2.4.5"

const val FROGO_UI = "com.github.frogobox:frogo-ui:$FROGO_UI_VERSION"
const val FROGO_CONSUME_API = "com.github.frogobox:frogo-consume-api:$FROGO_CONSUME_API_VERSION"

}
4 changes: 2 additions & 2 deletions frogorecyclerview/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@ android {
}

dependencies {
api(Androidx.recyclerview)
api("com.google.android.flexbox:flexbox:3.0.0")
api(libs.androidx.recyclerview)
api(libs.flexbox)
}

afterEvaluate {
Expand Down
145 changes: 145 additions & 0 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,145 @@
[versions]
agp = "8.5.1"
kotlin = "1.9.23"
ksp = "1.9.23-1.0.19"

coreKtx = "1.13.1"
appcompat = "1.7.0"
activity = "1.9.1"
fragment = "1.8.2"
constraintlayout = "2.1.4"
liveCycle = "2.8.4"
viewPager2 = "1.1.0"
preference = "1.2.1"
roomKtx = "2.6.1"
work = "2.9.1"
recyclerview = "1.3.2"

# Compose Version
composeCompiler = "1.5.12" # https://developer.android.com/jetpack/androidx/releases/compose
composeAnimation = "1.6.6"# https://developer.android.com/jetpack/androidx/releases/compose
composeActivity = "1.9.1" # https://androidx.tech/artifacts/activity/activity-compose/
compose = "1.6.8" # https://developer.android.com/jetpack/androidx/releases/compose
composeMaterial = "1.6.8" # https://developer.android.com/jetpack/androidx/releases/compose
composeFoundation = "1.6.6" # https://developer.android.com/jetpack/androidx/releases/compose
composeMaterial3 = "1.2.1" # https://developer.android.com/jetpack/androidx/releases/compose
composeNavigation = "2.7.7" # https://androidx.tech/artifacts/navigation/navigation-compose/
composeHiltNavigation = "1.2.0" # https://developer.android.com/jetpack/androidx/releases/hilt


material = "1.12.0"
gson = "2.10.1"

okhttp = "4.12.0"
retrofit = "2.11.0"

rxandroid3 = "3.0.2"
rxjava3 = "3.1.8"

chucker = "4.0.0"
glide = "4.16.0"
customactivityoncrash = "2.4.0"
circleimageview = "3.1.0"

flexbox = "3.0.0"


koin = "3.5.6"

frogorecylerview = "4.4.1"
frogosdk = "2.2.7"
frogoui = "2.0.3"
frogoConsumeApi = "2.5.4"

junit = "4.13.2"
junitVersion = "1.2.1"
espressoCore = "3.6.1"

[libraries]
# Android Kit
androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" }
androidx-activity-ktx = { group = "androidx.activity", name = "activity-ktx", version.ref = "activity" }
androidx-fragment-ktx = { group = "androidx.fragment", name = "fragment-ktx", version.ref = "fragment" }
androidx-work = { group = "androidx.work", name = "work-runtime", version.ref = "work" }
androidx-work-ktx = { group = "androidx.work", name = "work-runtime-ktx", version.ref = "work" }

androidx-recyclerview = { group = "androidx.recyclerview", name = "recyclerview", version.ref = "recyclerview" }

androidx-constraintlayout = { group = "androidx.constraintlayout", name = "constraintlayout", version.ref = "constraintlayout" }
androidx-lifecycle-runtime-ktx = { group = "androidx.lifecycle", name = "lifecycle-runtime-ktx", version.ref = "liveCycle" }
androidx-lifecycle-viewmodel-ktx = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-ktx", version.ref = "liveCycle" }
androidx-lifecycle-livedata-ktx = { group = "androidx.lifecycle", name = "lifecycle-livedata-ktx", version.ref = "liveCycle" }
androidx-lifecycle-compiler = { group = "androidx.lifecycle", name = "lifecycle-compiler", version.ref = "liveCycle" }

androidx-viewpager2 = { group = "androidx.viewpager2", name = "viewpager2", version.ref = "viewPager2" }
androidx-preference = { group = "androidx.preference", name = "preference", version.ref = "preference" }

androidx-room-runtime = { group = "androidx.room", name = "room-runtime", version.ref = "roomKtx" }
androidx-room-ktx = { group = "androidx.room", name = "room-ktx", version.ref = "roomKtx" }
androidx-room-rxjava3 = { group = "androidx.room", name = "room-rxjava3", version.ref = "roomKtx" }
androidx-room-compiler = { group = "androidx.room", name = "room-compiler", version.ref = "roomKtx" }

androidx-activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "composeActivity"}
androidx-compose-material = { group = "androidx.compose.material", name = "material", version.ref = "composeMaterial"}
androidx-compose-material3 = { group = "androidx.compose.material3", name = "material3", version.ref = "composeMaterial3"}
androidx-compose-animation = { group = "androidx.compose.animation", name = "animation", version.ref = "compose"}
androidx-compose-ui = { group = "androidx.compose.ui", name = "ui", version.ref = "compose"}
androidx-compose-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling", version.ref = "compose"}
androidx-compose-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview", version.ref = "compose"}
androidx-compose-ui-test-manifest = { group = "androidx.compose.ui", name = "ui-test-manifest", version.ref = "compose"}

flexbox = { group = "com.google.android.flexbox", name = "flexbox", version.ref = "flexbox" }
material = { group = "com.google.android.material", name = "material", version.ref = "material" }
gson = { group = "com.google.code.gson", name = "gson", version.ref = "gson" }

# --------------------------------------------------------------------------------------------------
# Test Library

androidx-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espressoCore" }
androidx-junit = { group = "androidx.test.ext", name = "junit", version.ref = "junitVersion" }
junit = { group = "junit", name = "junit", version.ref = "junit" }

# --------------------------------------------------------------------------------------------------
# Library

square-okhttp = { group = "com.squareup.okhttp3", name = "okhttp", version.ref = "okhttp" }
square-logging-interceptor = { group = "com.squareup.okhttp3", name = "logging-interceptor", version.ref = "okhttp" }

square-retrofit = { group = "com.squareup.retrofit2", name = "retrofit", version.ref = "retrofit" }
square-retrofit-converter-gson = { group = "com.squareup.retrofit2", name = "converter-gson", version.ref = "retrofit" }
square-retrofit-adapter-rxjava3 = { group = "com.squareup.retrofit2", name = "adapter-rxjava3", version.ref = "retrofit" }

reactivex-rxjava3 = { group = "io.reactivex.rxjava3", name = "rxjava", version.ref = "rxjava3" }
reactivex-rxandroid3 = { group = "io.reactivex.rxjava3", name = "rxandroid", version.ref = "rxandroid3" }

github-chucker = { group = "com.github.chuckerteam.chucker", name = "library", version.ref = "chucker" }
github-glide = { group = "com.github.bumptech.glide", name = "glide", version.ref = "glide" }
github-glide-compiler = { group = "com.github.bumptech.glide", name = "ksp", version.ref = "glide" }
github-customactivityoncrash = { group = "cat.ereza", name = "customactivityoncrash", version.ref = "customactivityoncrash" }
github-circleimageview = { group = "de.hdodenhof", name = "circleimageview", version.ref = "circleimageview" }

koin-core = { group = "io.insert-koin", name = "koin-core", version.ref = "koin" }
koin-android = { group = "io.insert-koin", name = "koin-android", version.ref = "koin" }
koin-android-compat = { group = "io.insert-koin", name = "koin-android-compat", version.ref = "koin" }
koin-androidx-workmanager = { group = "io.insert-koin", name = "koin-androidx-workmanager", version.ref = "koin" }

frogo-sdk = { group = "com.github.frogobox", name = "frogo-sdk", version.ref = "frogosdk" }
frogo-sdk-core = { group = "com.github.frogobox.frogo-sdk", name = "core-sdk", version.ref = "frogosdk" }

frogo-ui = { group = "com.github.frogobox", name = "frogo-ui", version.ref = "frogoui" }
frogo-ui-core = { group = "com.github.frogobox.frogo-ui", name = "core-ui", version.ref = "frogoui" }

frogo-consume-api = { group = "com.github.frogobox", name = "frogo-consume-api", version.ref = "frogoConsumeApi" }

frogo-recyclerview = { group = "com.github.amirisback", name = "frogo-recycler-view", version.ref = "frogorecylerview" }

# --------------------------------------------------------------------------------------------------


[plugins]
#android-application = { id = "com.android.application", version.ref = "agp" }
#android.library = { id = "com.android.library", version.ref = "agp"}
#jetbrains-kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
#jetbrains-kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin"}
#google-devtools-ksp = { id = "org.google.devtools.ksp", version.ref = "ksp"}

0 comments on commit 2fb50a0

Please sign in to comment.