Skip to content

Commit f5860b8

Browse files
committed
Merged in versionCatalogPluginImplementation (pull request #7)
[VersionCatalog]Moving dependancies to version catalog * [VersionCatalog] Draft implementation of version catalog in YTemplate * [VersionCatalog] Draft implementation of version catalog in YTemplate * [VersionCatalog] Reverting unused files * [VersionCatalog] Moving to version catalog from Dependencies.kt and cleaning up files * [VersionCatalog] Moving to version catalog from Dependencies.kt and cleaning up files * [VersionCatalog] Moving dependencies to version catalog * [VersionCatalog]Plugininfo draft implementation * [VersionCatalog] Moving dependencies to version catalog * [VersionCatalog] Moving dependencies to version catalog * [VersionCatalog] Moving dependencies to version catalog Approved-by: Ananthakrishna Bhaskar Approved-by: Deepak K K
1 parent 7d56cbd commit f5860b8

File tree

6 files changed

+24
-18
lines changed

6 files changed

+24
-18
lines changed

app/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ plugins {
22
id("com.android.application")
33
id("org.jetbrains.kotlin.android")
44
kotlin("kapt")
5-
id("com.google.dagger.hilt.android")
5+
alias(versionCatalogLibs.plugins.hilt.plugin)
66
id("jacoco-reports")
77
id("org.jetbrains.kotlin.plugin.serialization")
88
}
@@ -39,7 +39,7 @@ android {
3939
targetCompatibility = JavaVersion.VERSION_11
4040
}
4141
kotlinOptions {
42-
jvmTarget = "11"
42+
jvmTarget = versionCatalogLibs.versions.kotlin.jvm.target.get()
4343
}
4444
buildFeatures {
4545
compose = true

build.gradle.kts

Lines changed: 0 additions & 11 deletions
This file was deleted.

buildSrc/build.gradle.kts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,5 @@ gradlePlugin {
1616
}
1717
}
1818
dependencies {
19-
implementation("com.android.tools.build:gradle:7.4.0")
20-
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.20")
21-
implementation("com.squareup:javapoet:1.13.0")
22-
implementation("org.jetbrains.kotlin:kotlin-serialization:1.7.20")
19+
implementation(versionCatalogLibs.bundles.build.src)
2320
}

buildSrc/settings.gradle.kts

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
dependencyResolutionManagement {
2+
versionCatalogs {
3+
create("versionCatalogLibs") {
4+
from(files("../gradle/libs.versions.toml"))
5+
}
6+
}
7+
}

gradle/libs.versions.toml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
[versions]
22
# Define the dependency versions
3+
#gradle
4+
android_gradle_plugin = "7.4.1"
5+
kotlin_version = "1.7.20"
6+
kotlin_jvm_target = "11"
7+
sqaureup = "1.13.0"
8+
39
#compose
410
compose_ui = "1.3.2"
511
compose_material = "1.1.1"
@@ -37,6 +43,12 @@ target_sdk = "32"
3743
compile_sdk = "33"
3844

3945
[libraries]
46+
#buildSrc
47+
build_gradle = { module = "com.android.tools.build:gradle", version.ref = "android_gradle_plugin" }
48+
kotlin_gradle_plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin_version" }
49+
sqaureup_javapoet = { module = "com.squareup:javapoet", version.ref = "sqaureup" }
50+
kotlin_serialization = { module = "org.jetbrains.kotlin:kotlin-serialization", version.ref = "kotlin_version" }
51+
4052
#compose
4153
compose_ui = { module = "androidx.compose.ui:ui", version.ref = "compose_ui" }
4254
compose_material = { module = "androidx.compose.material:material", version.ref = "compose_material" }
@@ -94,6 +106,7 @@ room = ["room.runtime", "room.ktx"]
94106
ktor = ["ktor.core", "ktor.client","ktor.content.negotiation","ktor.serialization","ktor.client.logging","kotlinx.serialization"]
95107
android_test = ["junit.android", "espresso.test","compose.ui.testing"]
96108
android_debug_test = ["compose.tooling.testing", "compose.ui.manifest.test"]
109+
build_src = ["build.gradle", "kotlin.gradle.plugin","sqaureup.javapoet","kotlin.serialization"]
97110

98111
[plugins]
99112
# Define Plugins

testdata/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
plugins {
22
id("com.android.library")
3-
id("org.jetbrains.kotlin.android")
3+
alias(versionCatalogLibs.plugins.kotlin.android)
44
}
55

66
android {

0 commit comments

Comments
 (0)