Skip to content

Commit

Permalink
use version catalog
Browse files Browse the repository at this point in the history
  • Loading branch information
@slisson
slisson committed Aug 9, 2023
1 parent f5f3cdf commit f5ee995
Show file tree
Hide file tree
Showing 11 changed files with 60 additions and 89 deletions.
14 changes: 3 additions & 11 deletions behavior-aspect/build.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,6 @@ plugins {
`maven-publish`
}

val modelixCoreVersion: String by rootProject
val modelixIncrementalVersion: String by rootProject
val kotlinVersion: String by rootProject
val kotlinCoroutinesVersion: String by rootProject
val ktorVersion: String by rootProject
val kotlinLoggingVersion: String by rootProject
val kotlinxHtmlVersion: String by rootProject

kotlin {
jvm()
js(IR) {
Expand All @@ -27,10 +19,10 @@ kotlin {
sourceSets {
val commonMain by getting {
dependencies {
implementation("org.modelix:model-api:$modelixCoreVersion")
implementation("org.modelix:model-api-gen-runtime:$modelixCoreVersion")
implementation(libs.modelix.model.api)
implementation(libs.modelix.model.api.gen.runtime)
implementation(kotlin("stdlib-common"))
implementation("io.github.microutils:kotlin-logging:$kotlinLoggingVersion")
implementation(coreLibs.kotlin.logging)
implementation(project(":language-aspects"))
}
}
Expand Down
3 changes: 2 additions & 1 deletion build.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ plugins {
`maven-publish`
id("com.palantir.git-version") version "3.0.0"
id("com.dorongold.task-tree") version "2.1.1"
kotlin("multiplatform") apply false
alias(coreLibs.plugins.kotlin.multiplatform) apply false
alias(coreLibs.plugins.kotlin.serialization) apply false
}

group = "org.modelix"
Expand Down
8 changes: 0 additions & 8 deletions gradle.properties
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,2 @@
kotlin.daemon.jvmargs=-Xmx3G
kotlin.mpp.stability.nowarn=true

kotlinVersion=1.8.20
kotlinCoroutinesVersion=1.6.4
ktorVersion=2.2.4
kotlinLoggingVersion=3.0.5
kotlinxHtmlVersion=0.8.0
modelixCoreVersion=2.4.0
modelixIncrementalVersion=0.1.4
14 changes: 14 additions & 0 deletions gradle/libs.versions.toml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
[bundles]

[plugins]
modelix-model-api-gen = { id = "org.modelix.model-api-gen", version.ref = "modelixCore" }

[versions]
modelixCore = "2.15.5"

[libraries]
modelix-model-api = { group = "org.modelix", name = "model-api", version.ref = "modelixCore" }
modelix-model-api-gen-runtime = { group = "org.modelix", name = "model-api-gen-runtime", version.ref = "modelixCore" }
modelix-light-model-client = { group = "org.modelix", name = "light-model-client", version.ref = "modelixCore" }
modelix-model-client = { group = "org.modelix", name = "model-client", version.ref = "modelixCore" }
kotlin-html = "org.jetbrains.kotlinx:kotlinx-html:0.8.0"
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
4 changes: 1 addition & 3 deletions kernelf-angular-demo/build.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@ node {
download.set(true)
}

val modelixCoreVersion: String by rootProject

tasks.named("npm_run_build") {
inputs.dir("src")
inputs.file("package.json")
Expand All @@ -34,7 +32,7 @@ val updateTsModelApiVersion = tasks.create("updateTsModelApiVersion") {
val replacement = if (localPath.exists()) {
""""@modelix/ts-model-api": "file:${localPath.relativeTo(projectDir)}""""
} else {
""""@modelix/ts-model-api": "$modelixCoreVersion""""
""""@modelix/ts-model-api": "${libs.versions.modelixCore.get()}""""
}
println("ts-model-api version: $replacement")
text = text.replace(Regex(""""@modelix/ts-model-api": ".*""""), replacement)
Expand Down
16 changes: 4 additions & 12 deletions kernelf-apigen/build.gradle.kts
View file
Original file line number Diff line number Diff line change
@@ -1,29 +1,21 @@
import org.modelix.gradle.mpsbuild.MPSBuildSettings

buildscript {
repositories {
mavenLocal()
maven { url = uri("https://artifacts.itemis.cloud/repository/maven-mps/") }
}
dependencies {
val modelixCoreVersion: String by rootProject
classpath("org.modelix:model-api:$modelixCoreVersion")
classpath(libs.modelix.model.api)
classpath("com.charleskorn.kaml:kaml:0.55.0")
}
}

plugins {
kotlin("multiplatform")
`maven-publish`
id("org.modelix.mps.build-tools") version "1.1.0"
id("org.modelix.model-api-gen")
alias(libs.plugins.modelix.model.api.gen)
alias(coreLibs.plugins.modelix.mps.buildtools)
}

val modelixCoreVersion: String by rootProject
val kotlinLoggingVersion: String by rootProject
val kotlinCoroutinesVersion: String by rootProject
val kotlinxHtmlVersion: String by rootProject

val generatorOutputDir = buildDir.resolve("apigen").resolve("src_gen")
val tsGeneratorOutputDir = file("../kernelf-angular-demo/src/gen")

Expand All @@ -43,7 +35,7 @@ kotlin {
sourceSets {
val commonMain by getting {
dependencies {
implementation("org.modelix:model-api-gen-runtime:$modelixCoreVersion")
implementation(libs.modelix.model.api.gen.runtime)
implementation(kotlin("stdlib-common"))
}
kotlin.srcDir(generatorOutputDir)
Expand Down
28 changes: 11 additions & 17 deletions kernelf-editor/build.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ buildscript {
maven { url = uri("https://artifacts.itemis.cloud/repository/maven-mps/") }
}
dependencies {
val modelixCoreVersion: String by rootProject
}
}

Expand All @@ -16,11 +15,6 @@ plugins {
`maven-publish`
}

val modelixCoreVersion: String by rootProject
val kotlinLoggingVersion: String by rootProject
val kotlinCoroutinesVersion: String by rootProject
val kotlinxHtmlVersion: String by rootProject

val generatorOutputDir = file("src/commonMain/kotlin_gen")
val tsGeneratorOutputDir = file("../kernelf-angular-demo/src/gen")

Expand Down Expand Up @@ -55,49 +49,49 @@ kotlin {
}
val commonMain by getting {
dependencies {
implementation("org.modelix:model-api-gen-runtime:$modelixCoreVersion")
implementation(libs.modelix.model.api.gen.runtime)
implementation(project(":projectional-editor"))
implementation(project(":language-aspects"))
implementation(project(":behavior-aspect"))
implementation(kotlin("stdlib-common"))
implementation("io.github.microutils:kotlin-logging:$kotlinLoggingVersion")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlinCoroutinesVersion")
implementation("org.modelix:light-model-client:$modelixCoreVersion")
implementation("org.modelix:model-client:$modelixCoreVersion")
implementation("org.jetbrains.kotlinx:kotlinx-html:$kotlinxHtmlVersion")
implementation(coreLibs.kotlin.logging)
implementation(coreLibs.kotlin.coroutines.core)
implementation(libs.modelix.light.model.client)
implementation(libs.modelix.model.client)
implementation(libs.kotlin.html)
implementation(project(":kernelf-apigen"))
}
kotlin.srcDir(generatorOutputDir)
}
val commonTest by getting {
dependencies {
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:$kotlinCoroutinesVersion")
implementation(coreLibs.kotlin.coroutines.test)
implementation(kotlin("test-common"))
implementation(kotlin("test-annotations-common"))
implementation(project(":kernelf-apigen"))
}
}
val jvmMain by getting {
dependencies {
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-swing:$kotlinCoroutinesVersion")
implementation(coreLibs.kotlin.coroutines.swing)
}
}
val jvmTest by getting {
dependencies {
implementation("org.modelix:model-api-gen-runtime:$modelixCoreVersion")
implementation(libs.modelix.model.api.gen.runtime)
implementation(kotlin("test"))
implementation(kotlin("test-junit"))
}
}
val jsMain by getting {
dependencies {
api("org.modelix:model-api:$modelixCoreVersion")
api(libs.modelix.model.api)

val localPath = rootDir.parentFile.resolve("modelix.core").resolve("ts-model-api")
if (localPath.exists()) {
implementation(npm("@modelix/ts-model-api", localPath))
} else {
implementation(npm("@modelix/ts-model-api", modelixCoreVersion))
implementation(npm("@modelix/ts-model-api", libs.versions.modelixCore.get()))
}
}
}
Expand Down
14 changes: 3 additions & 11 deletions language-aspects/build.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,6 @@ plugins {
`maven-publish`
}

val modelixCoreVersion: String by rootProject
val modelixIncrementalVersion: String by rootProject
val kotlinVersion: String by rootProject
val kotlinCoroutinesVersion: String by rootProject
val ktorVersion: String by rootProject
val kotlinLoggingVersion: String by rootProject
val kotlinxHtmlVersion: String by rootProject

kotlin {
jvm()
js(IR) {
Expand All @@ -27,10 +19,10 @@ kotlin {
sourceSets {
val commonMain by getting {
dependencies {
implementation("org.modelix:model-api:$modelixCoreVersion")
implementation("org.modelix:model-api-gen-runtime:$modelixCoreVersion")
implementation(libs.modelix.model.api)
implementation(libs.modelix.model.api.gen.runtime)
implementation(kotlin("stdlib-common"))
implementation("io.github.microutils:kotlin-logging:$kotlinLoggingVersion")
implementation(coreLibs.kotlin.logging)
}
}
val commonTest by getting {
Expand Down
24 changes: 8 additions & 16 deletions projectional-editor/build.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,6 @@ plugins {
`maven-publish`
}

val modelixCoreVersion: String by rootProject
val modelixIncrementalVersion: String by rootProject
val kotlinVersion: String by rootProject
val kotlinCoroutinesVersion: String by rootProject
val ktorVersion: String by rootProject
val kotlinLoggingVersion: String by rootProject
val kotlinxHtmlVersion: String by rootProject

kotlin {
jvm()
js(IR) {
Expand All @@ -27,27 +19,27 @@ kotlin {
sourceSets {
val commonMain by getting {
dependencies {
implementation("org.modelix:model-api:$modelixCoreVersion")
implementation("org.modelix:model-api-gen-runtime:$modelixCoreVersion")
implementation(libs.modelix.model.api)
implementation(libs.modelix.model.api.gen.runtime)
implementation(kotlin("stdlib-common"))
implementation("io.github.microutils:kotlin-logging:$kotlinLoggingVersion")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlinCoroutinesVersion")
api("org.modelix:incremental:$modelixIncrementalVersion")
api("org.jetbrains.kotlinx:kotlinx-html:$kotlinxHtmlVersion")
implementation(coreLibs.kotlin.logging)
implementation(coreLibs.kotlin.coroutines.core)
api(coreLibs.modelix.incremental)
api(libs.kotlin.html)
implementation(project(":language-aspects"))
implementation(project(":behavior-aspect"))
}
}
val commonTest by getting {
dependencies {
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:$kotlinCoroutinesVersion")
implementation(coreLibs.kotlin.coroutines.test)
implementation(kotlin("test-common"))
implementation(kotlin("test-annotations-common"))
}
}
val jvmMain by getting {
dependencies {
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-swing:$kotlinCoroutinesVersion")
implementation(coreLibs.kotlin.coroutines.swing)
}
}
val jvmTest by getting {
Expand Down
22 changes: 13 additions & 9 deletions settings.gradle.kts
View file
Original file line number Diff line number Diff line change
@@ -1,19 +1,23 @@
pluginManagement {
val kotlinVersion: String by settings
val modelixCoreVersion: String by settings
plugins {
kotlin("multiplatform") version kotlinVersion apply false
kotlin("plugin.serialization") version kotlinVersion apply false
id("org.modelix.model-api-gen") version modelixCoreVersion apply false
}
resolutionStrategy {
}
repositories {
mavenLocal()
gradlePluginPortal()
maven { url = uri("https://artifacts.itemis.cloud/repository/maven-mps/") }
mavenCentral()
}
dependencyResolutionManagement {
repositories {
mavenLocal()
gradlePluginPortal()
maven { url = uri("https://artifacts.itemis.cloud/repository/maven-mps/") }
mavenCentral()
}
versionCatalogs {
create("coreLibs") {
from("org.modelix:core-version-catalog:2.15.5")
}
}
}
}

rootProject.name = "modelix.text-editor"
Expand Down

0 comments on commit f5ee995

Please sign in to comment.