Skip to content

Commit

Permalink
replace libs to vsCoreLibs (#10)
Browse files Browse the repository at this point in the history
  • Loading branch information
VladislavSumin authored Dec 15, 2024
1 parent 241e1a2 commit 559ab43
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 12 deletions.
6 changes: 3 additions & 3 deletions build-scripts/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ plugins {
dependencies {
// Мы хотим получать доступ к libs из наших convention плагинов, но гредл на текущий момент не умеет прокидывать
// version catalogs. Поэтому используем костыль отсюда - https://github.com/gradle/gradle/issues/15383
implementation(files(libs.javaClass.superclass.protectionDomain.codeSource.location))
implementation(files(vsCoreLibs.javaClass.superclass.protectionDomain.codeSource.location))

implementation(libs.gradlePlugins.kotlin.core)
implementation(libs.gradlePlugins.android)
implementation(vsCoreLibs.gradlePlugins.kotlin.core)
implementation(vsCoreLibs.gradlePlugins.android)
}
2 changes: 1 addition & 1 deletion build-scripts/common-settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ dependencyResolutionManagement {
gradlePluginPortal()
}
versionCatalogs {
create("libs") {
create("vsCoreLibs") {
from(files("../libs.versions.toml"))
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package ru.vladislavsumin.convention.kmp

import ru.vladislavsumin.utils.libs
import ru.vladislavsumin.utils.vsCoreLibs

/**
* Базовая настройка KMP.
Expand All @@ -19,7 +19,7 @@ kotlin {
dependencies {
implementation(kotlin("test-common"))
implementation(kotlin("test-annotations-common"))
implementation(libs.kotlin.coroutines.test)
implementation(vsCoreLibs.kotlin.coroutines.test)
}
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package ru.vladislavsumin.utils

import org.gradle.accessors.dm.LibrariesForLibs
import org.gradle.accessors.dm.LibrariesForVsCoreLibs
import org.gradle.api.Project
import org.gradle.kotlin.dsl.the

/**
* Предоставляет доступ к каталогу версий внутри convention плагинов и прочего кода.
*/
val Project.libs: LibrariesForLibs get() = rootProject.the()
val Project.vsCoreLibs: LibrariesForVsCoreLibs get() = rootProject.the()
8 changes: 4 additions & 4 deletions core/decompose/components/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ kotlin {

sourceSets {
commonMain.dependencies {
api(libs.kotlin.coroutines.core)
api(libs.decompose.core)
api(vsCoreLibs.kotlin.coroutines.core)
api(vsCoreLibs.decompose.core)

implementation(libs.kotlin.serialization.core)
implementation(libs.kotlin.serialization.json)
implementation(vsCoreLibs.kotlin.serialization.core)
implementation(vsCoreLibs.kotlin.serialization.json)
}
}
}
Expand Down

0 comments on commit 559ab43

Please sign in to comment.