Skip to content
This repository has been archived by the owner on Feb 22, 2024. It is now read-only.

Upgrade AGP & move all dependencies to Version Catalog #91

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Upgrade AGP & move all dependencies to Version Catalog #91

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 7 additions & 7 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,20 +23,20 @@ buildscript {
mavenCentral()
}
dependencies {
classpath("com.android.tools.build:gradle:7.1.1")
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.31")
classpath(libs.agp)
classpath(libs.kotlin.plugin)

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
}
}

plugins {
id("com.diffplug.spotless") version "5.12.5"
id("org.jetbrains.dokka") version "1.4.32"
id("me.tylerbwong.gradle.metalava") version "0.1.9" apply false
id("com.vanniktech.maven.publish") version "0.18.0" apply false
id("org.jetbrains.kotlin.plugin.parcelize") version "1.4.32" apply false
alias(libs.plugins.spotless)
alias(libs.plugins.dokka)
alias(libs.plugins.metalava) apply false
alias(libs.plugins.maven.publish) apply false
alias(libs.plugins.kotlin.parcelize) apply false
Comment on lines +35 to +39
Copy link
Contributor Author

@ghostbear ghostbear Feb 28, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just gonna mention that libs creates a false-positive here in Android Studio but the project sync and build just fine

https://youtrack.jetbrains.com/issue/KTIJ-19369

}

allprojects {
Expand Down
10 changes: 10 additions & 0 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@
kotlin = "1.5.31"

[libraries]
agp = { module = "com.android.tools.build:gradle", version = "7.1.2" }
kotlin-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }

stdlib-jdk7 = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk7", version.ref = "kotlin" }
coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version = "1.5.2" }

Expand All @@ -10,3 +13,10 @@ glide = { module = "com.github.skydoves:landscapist-glide", version = "1.4.5" }

junit = { module = "junit:junit", version = "4.13.2" }
robolectric = { module = "org.robolectric:robolectric", version = "4.7.3" }

[plugins]
spotless = { id = "com.diffplug.spotless", version = "5.12.5" }
dokka = { id = "org.jetbrains.dokka", version = "1.4.32" }
metalava = { id = "me.tylerbwong.gradle.metalava", version = "0.1.9" }
maven-publish = { id = "com.vanniktech.maven.publish", version = "0.18.0" }
kotlin-parcelize = { id = "org.jetbrains.kotlin.plugin.parcelize", version = "1.4.32" }
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
1 change: 0 additions & 1 deletion settings.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
enableFeaturePreview("VERSION_CATALOGS")

dependencyResolutionManagement {
versionCatalogs {
Expand Down