-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Migrate to Version Catalog (+Bump Deps)
- Loading branch information
Ian Bird
committed
Apr 18, 2024
1 parent
5dc98c0
commit cf8c61d
Showing
21 changed files
with
421 additions
and
296 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,27 +1,30 @@ | ||
| buildscript { | ||
| ext { | ||
| compose_ui_version = '1.4.0' | ||
| compose_ui_version = '1.5.0' | ||
| } | ||
| } | ||
|
|
||
| // Top-level build file where you can add configuration options common to all sub-projects/modules. | ||
| plugins { | ||
| id 'com.android.application' version '8.2.2' apply false | ||
| id 'com.android.library' version '8.2.2' apply false | ||
| id 'org.jetbrains.kotlin.android' version '1.9.20' apply false | ||
| id 'org.jetbrains.dokka' version '1.9.10' apply false | ||
| id 'com.vanniktech.maven.publish' version "0.25.1" apply false | ||
| alias libs.plugins.androidApplication apply false | ||
| alias libs.plugins.androidLibrary apply false | ||
| alias libs.plugins.kotlinAndroid apply false | ||
| alias libs.plugins.dokka apply false | ||
| alias libs.plugins.mavenPublish apply false | ||
|
|
||
| id 'com.diffplug.spotless' version "6.19.0" | ||
| alias libs.plugins.spotless | ||
| } | ||
|
|
||
| subprojects { | ||
| apply plugin: 'com.diffplug.spotless' | ||
| spotless { | ||
| kotlin { | ||
| target("src/**/*.kt") | ||
| targetExclude("$buildDir/**/*") | ||
| targetExclude("bin/**/*") | ||
| ktlint() | ||
| .editorConfigOverride([ | ||
| 'ktlint_standard_property-naming': 'disabled', | ||
| 'ktlint_function_naming_ignore_when_annotated_with': 'Composable' | ||
| ]) | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| [versions] | ||
| agp = "8.3.2" | ||
| kotlin = "1.9.23" | ||
| core-ktx = "1.13.0" | ||
| junit = "4.13.2" | ||
| appcompat = "1.6.1" | ||
| coroutines-version = "1.8.0" | ||
| compose = "1.9.0" | ||
| compose-bom = "2024.04.01" | ||
| compose-tooling = "1.6.6" | ||
| gma = "23.0.0" | ||
| ima = "3.33.0" | ||
|
|
||
| [libraries] | ||
| core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "core-ktx" } | ||
| kotlinx-coroutines = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-android", version = "1.8.0" } | ||
| androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" } | ||
| androidx-lifecycle = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-ktx", version = "2.7.0" } | ||
|
|
||
| # Compose | ||
| compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "compose-bom" } | ||
| compose-activity = { group = "androidx.activity", name = "activity-compose", version.ref = "compose" } | ||
| compose-ui = { group = "androidx.compose.ui", name = "ui", version.ref = "compose-tooling" } | ||
| compose-tooling = { group = "androidx.compose.ui", name = "ui-tooling", version.ref = "compose-tooling" } | ||
| compose-test-manifest = { group = "androidx.compose.ui", name = "ui-test-manifest", version.ref = "compose-tooling"} | ||
| compose-material = { group = "androidx.compose.material", name = "material", version = "1.6.6" } | ||
|
|
||
| # OkHttp | ||
| okhttp-core = { group = "com.squareup.okhttp3", name = "okhttp", version = "4.12.0" } | ||
|
|
||
| # GMA / IMA | ||
| gma-ads = { group = "com.google.android.gms", name = "play-services-ads", version.ref = "gma" } | ||
| ima-ads = { group = "com.google.ads.interactivemedia.v3", name = "interactivemedia", version.ref = "ima" } | ||
| androidx-multidex = { group = "androidx.multidex", name = "multidex", version = "2.0.1" } | ||
| androidx-constraintlayout = { group = "androidx.constraintlayout", name = "constraintlayout", version = "2.1.4" } | ||
| androidx-media = { group = "androidx.media", name = "media", version = "1.7.0" } | ||
| androidx-browser = { group = "androidx.browser", name = "browser", version = "1.8.0" } | ||
| androidx-activity-ktx = { group = "androidx.activity", name = "activity-ktx", version = "1.9.0" } | ||
|
|
||
| # Testing | ||
| junit = { group = "junit", name = "junit", version.ref = "junit" } | ||
| kotlinx-coroutines-test = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-test", version.ref = "coroutines-version" } | ||
| json = { group = "org.json", name = "json", version = "20240303" } | ||
| mockito-kotlin = { group = "org.mockito.kotlin", name = "mockito-kotlin", version = "4.1.0" } | ||
| mockito-inline = { group = "org.mockito", name = "mockito-inline", version = "4.8.0" } | ||
|
|
||
| [plugins] | ||
| androidApplication = { id = "com.android.application", version.ref = "agp" } | ||
| androidLibrary = { id = "com.android.library", version.ref = "agp" } | ||
| kotlinAndroid = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } | ||
| spotless = { id = "com.diffplug.spotless", version = "6.25.0" } | ||
| dokka = { id = "org.jetbrains.dokka", version = "1.9.20" } | ||
| mavenPublish = { id = "com.vanniktech.maven.publish", version = "0.28.0" } |
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,7 @@ | ||
| #Mon Mar 13 14:21:49 GMT 2023 | ||
| distributionBase=GRADLE_USER_HOME | ||
| distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip | ||
| distributionPath=wrapper/dists | ||
| zipStorePath=wrapper/dists | ||
| distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip | ||
| networkTimeout=10000 | ||
| validateDistributionUrl=true | ||
| zipStoreBase=GRADLE_USER_HOME | ||
| zipStorePath=wrapper/dists |
Oops, something went wrong.