Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Changes remote dependencies to version catalogue dependencies #232

Merged
merged 4 commits into from
Oct 24, 2023
Merged

Changes remote dependencies to version catalogue dependencies #232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
84c2b54
change
Raynafs Oct 19, 2023
0ba6740
Merge branch 'droidconKE:main' into tr
Raynafs Oct 20, 2023
28fb51a
changes Project level and data gradle to match convention
Raynafs Oct 22, 2023
be770e2
changes version catalog
Raynafs Oct 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ buildscript {
}
}
plugins {
id("com.android.application") version "8.1.0" apply false
id("com.android.library") version "8.1.0" apply false
id("org.jetbrains.kotlin.android") version "1.8.20" apply false
id("com.google.devtools.ksp") version "1.8.20-1.0.11" apply true
kotlin("plugin.serialization") version "1.6.21"
id("org.jlleitschuh.gradle.ktlint") version "11.3.2"
id("io.gitlab.arturbosch.detekt") version "1.18.0-RC2"
id("com.diffplug.spotless") version "6.0.0"
alias(libs.plugins.android.application) apply false
alias(libs.plugins.android.library) apply false
alias(libs.plugins.kotlin.android) apply false
alias(libs.plugins.ksp) apply false
alias(libs.plugins.kotlin.serialization) apply false
alias(libs.plugins.jlleitschuh)
alias(libs.plugins.detekt)
alias(libs.plugins.spotless)
}

allprojects {
Expand Down
2 changes: 1 addition & 1 deletion data/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ plugins {
alias(libs.plugins.droidconke.android.library)
alias(libs.plugins.droidconke.android.hilt)
alias(libs.plugins.droidconke.android.library.firebase)
kotlin("plugin.serialization")
alias(libs.plugins.kotlin.serialization)
}

android {
Expand Down
3 changes: 2 additions & 1 deletion datasource/remote/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/

plugins {
alias(libs.plugins.droidconke.android.library)
alias(libs.plugins.droidconke.android.hilt)
alias(libs.plugins.droidconke.android.library.firebase)
kotlin("plugin.serialization")
alias(libs.plugins.kotlin.serialization)
}

android {
Expand Down
11 changes: 8 additions & 3 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ composecompiler = "1.4.6"
coroutines = "1.7.3"
desugar_jdk_libs = "2.0.3"
espresso = "3.5.1"
gradleplugin = "8.0.2"
gradleplugin = "8.1.2"
hilt = "2.47"
kotlin = "1.8.20"
lifecycle = "2.6.2"
Expand All @@ -18,6 +18,9 @@ chucker = "4.0.0"
ksp = "1.8.20-1.0.11"
androidxComposeBom = "2023.09.00"
remote_config = "21.4.1"
detekt = "1.19.0"
klint = "11.6.1"
spotless = "6.4.2"

[libraries]
android-appCompat = "androidx.appcompat:appcompat:1.6.1"
Expand Down Expand Up @@ -123,14 +126,15 @@ test = ["junit4", "test-junit-ktx"]
[plugins]
android-application = { id = "com.android.application", version.ref = "gradleplugin" }
android-library = { id = "com.android.library", version.ref = "gradleplugin" }
detekt = "io.gitlab.arturbosch.detekt:1.19.0"
detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt" }
hilt-plugin = { id = "com.google.dagger.hilt.android", version.ref = "hilt" }
kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
kotlin-kapt = { id = "org.jetbrains.kotlin.kapt", version.ref = "kotlin" }
spotless = "com.diffplug.spotless:6.4.2"
spotless = { id = "com.diffplug.spotless", version.ref = "spotless" }
toml-checker = "com.github.ben-manes.versions:0.42.0"
toml-updater = "nl.littlerobots.version-catalog-update:0.3.1"
ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
jlleitschuh = { id = "org.jlleitschuh.gradle.ktlint", version.ref = "klint" }

# Convention plugins defined in the project
droidconke-android-library = { id = "droidconke.android.library", version = "unspecified" }
Expand All @@ -140,3 +144,4 @@ droidconke-android-library-compose = { id = "droidconke.android.library.compose"
droidconke-android-application-firebase = { id = "droidconke.android.application.firebase", version = "unspecified" }
droidconke-android-library-firebase = { id = "droidconke.android.library.firebase", version = "unspecified" }
droidconke-android-application = { id = "droidconke.android.application", version = "unspecified" }
kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
Loading