Skip to content

Commit

Permalink
Bump idofront
Browse files Browse the repository at this point in the history
  • Loading branch information
@0ffz
0ffz committed Feb 13, 2024
1 parent 8395953 commit 2ebf97f
Show file tree
Hide file tree
Showing 11 changed files with 61 additions and 61 deletions.
1 change: 1 addition & 0 deletions .github/workflows/publish-packages.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ jobs:
- uses: MineInAbyss/publish-action@master
with:
maven-metadata-url: https://repo.mineinabyss.com/releases/com/mineinabyss/geary-core/maven-metadata.xml
maven-snapshot-metadata-url: https://repo.mineinabyss.com/snapshots/com/mineinabyss/geary-core/maven-metadata.xml
# pages-path: build/dokka/htmlMultiModule/
# dokka: dokkaHtmlMultiModule
maven-username: ${{ secrets.MAVEN_PUBLISH_USERNAME }}
Expand Down
12 changes: 6 additions & 6 deletions addons/geary-autoscan/build.gradle.kts
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
plugins {
id(libs.plugins.mia.kotlin.jvm.get().pluginId)
id(libs.plugins.mia.publication.get().pluginId)
alias(libs.plugins.kotlinx.serialization)
id(idofrontLibs.plugins.mia.kotlin.jvm.get().pluginId)
id(idofrontLibs.plugins.mia.publication.get().pluginId)
alias(idofrontLibs.plugins.kotlinx.serialization)
}

dependencies {
compileOnly(project(":geary-core"))
compileOnly(project(":geary-serialization"))

implementation(libs.reflections)
implementation(libs.kotlin.reflect)
implementation(libs.idofront.di)
implementation(idofrontLibs.reflections)
implementation(idofrontLibs.kotlin.reflect)
implementation(idofrontLibs.idofront.di)
}
26 changes: 13 additions & 13 deletions addons/geary-prefabs/build.gradle.kts
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
plugins {
id(libs.plugins.mia.kotlin.multiplatform.get().pluginId)
id(libs.plugins.mia.publication.get().pluginId)
alias(libs.plugins.kotlinx.serialization)
id(idofrontLibs.plugins.mia.kotlin.multiplatform.get().pluginId)
id(idofrontLibs.plugins.mia.publication.get().pluginId)
alias(idofrontLibs.plugins.kotlinx.serialization)
}

kotlin {
Expand All @@ -11,32 +11,32 @@ kotlin {
sourceSets {
val commonMain by getting {
dependencies {
compileOnly(mylibs.okio)
compileOnly(mylibs.uuid)
compileOnly(libs.kotlinx.serialization.json)
compileOnly(libs.kotlinx.serialization.cbor)
compileOnly(libs.okio)
compileOnly(libs.uuid)
compileOnly(idofrontLibs.kotlinx.serialization.json)
compileOnly(idofrontLibs.kotlinx.serialization.cbor)

compileOnly(project(":geary-core"))
compileOnly(project(":geary-serialization"))
implementation(libs.idofront.di)
implementation(idofrontLibs.idofront.di)
}
}

val commonTest by getting {
dependencies {
implementation(kotlin("test"))
implementation(libs.kotlinx.coroutines.test)
implementation(libs.kotest.assertions)
implementation(libs.kotest.property)
implementation(libs.idofront.di)
implementation(idofrontLibs.kotlinx.coroutines.test)
implementation(idofrontLibs.kotest.assertions)
implementation(idofrontLibs.kotest.property)
implementation(idofrontLibs.idofront.di)
implementation(project(":geary-core"))
implementation(project(":geary-serialization"))
}
}

val jvmTest by getting {
dependencies {
implementation(libs.junit.jupiter)
implementation(idofrontLibs.junit.jupiter)
}
}
}
Expand Down
18 changes: 9 additions & 9 deletions addons/geary-serialization/build.gradle.kts
View file
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
plugins {
id(libs.plugins.mia.kotlin.multiplatform.get().pluginId)
id(libs.plugins.mia.publication.get().pluginId)
alias(libs.plugins.kotlinx.serialization)
id(idofrontLibs.plugins.mia.kotlin.multiplatform.get().pluginId)
id(idofrontLibs.plugins.mia.publication.get().pluginId)
alias(idofrontLibs.plugins.kotlinx.serialization)
}

kotlin {
sourceSets {
commonMain {
dependencies {
compileOnly(project(":geary-core"))
compileOnly(libs.kotlinx.serialization.json)
compileOnly(libs.kotlinx.serialization.cbor)
compileOnly(idofrontLibs.kotlinx.serialization.json)
compileOnly(idofrontLibs.kotlinx.serialization.cbor)

implementation(mylibs.uuid)
implementation(libs.idofront.di)
implementation(libs.uuid)
implementation(idofrontLibs.idofront.di)

api(mylibs.okio)
api(libs.okio)
}
}
jvmMain {
dependencies {
compileOnly(libs.kotlinx.serialization.kaml)
compileOnly(idofrontLibs.kotlinx.serialization.kaml)
}
}
}
Expand Down
10 changes: 5 additions & 5 deletions addons/geary-uuid/build.gradle.kts
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
id(libs.plugins.mia.kotlin.multiplatform.get().pluginId)
id(libs.plugins.mia.publication.get().pluginId)
id(idofrontLibs.plugins.mia.kotlin.multiplatform.get().pluginId)
id(idofrontLibs.plugins.mia.publication.get().pluginId)
}

kotlin {
Expand All @@ -9,9 +9,9 @@ kotlin {
dependencies {
implementation(project(":geary-core"))

api(mylibs.uuid)
implementation(mylibs.atomicfu)
implementation(libs.idofront.di)
api(libs.uuid)
implementation(libs.atomicfu)
implementation(idofrontLibs.idofront.di)
}
}
}
Expand Down
6 changes: 3 additions & 3 deletions build.gradle.kts
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
plugins {
alias(libs.plugins.kotlin.multiplatform)
alias(libs.plugins.dokka)
alias(libs.plugins.mia.autoversion)
alias(idofrontLibs.plugins.kotlin.multiplatform)
alias(idofrontLibs.plugins.dokka)
alias(idofrontLibs.plugins.mia.autoversion)
}

allprojects {
Expand Down
6 changes: 3 additions & 3 deletions geary-benchmarks/build.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ import kotlinx.benchmark.gradle.JvmBenchmarkTarget
import org.jetbrains.kotlin.allopen.gradle.AllOpenExtension

plugins {
id(libs.plugins.mia.kotlin.jvm.get().pluginId)
// id(libs.plugins.mia.publication.get().pluginId)
// alias(libs.plugins.kotlinx.serialization)
id(idofrontLibs.plugins.mia.kotlin.jvm.get().pluginId)
// id(idofrontLibs.plugins.mia.publication.get().pluginId)
// alias(idofrontLibs.plugins.kotlinx.serialization)
id("org.jetbrains.kotlinx.benchmark") version "0.4.9"
kotlin("plugin.allopen") version "1.9.10"
}
Expand Down
38 changes: 19 additions & 19 deletions geary-core/build.gradle.kts
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import org.jetbrains.kotlin.gradle.plugin.KotlinTarget

plugins {
id(libs.plugins.mia.kotlin.multiplatform.get().pluginId)
id(libs.plugins.mia.publication.get().pluginId)
alias(libs.plugins.kotlinx.serialization)
id(idofrontLibs.plugins.mia.kotlin.multiplatform.get().pluginId)
id(idofrontLibs.plugins.mia.publication.get().pluginId)
alias(idofrontLibs.plugins.kotlinx.serialization)
}

buildscript {
dependencies {
classpath("org.jetbrains.kotlinx:atomicfu-gradle-plugin:${mylibs.versions.atomicfu.get()}")
classpath("org.jetbrains.kotlinx:atomicfu-gradle-plugin:${libs.versions.atomicfu.get()}")
}
}

Expand All @@ -26,32 +26,32 @@ kotlin {
val commonMain by getting {
dependencies {
implementation(kotlin("stdlib-common"))
implementation(mylibs.atomicfu)
implementation(libs.kotlin.reflect)
implementation(libs.kotlinx.serialization.cbor)

api(libs.idofront.di)
api(mylibs.kermit)
api(libs.kotlinx.coroutines)
api(libs.kotlinx.serialization.json)
implementation(libs.atomicfu)
implementation(idofrontLibs.kotlin.reflect)
implementation(idofrontLibs.kotlinx.serialization.cbor)

api(idofrontLibs.idofront.di)
api(libs.kermit)
api(idofrontLibs.kotlinx.coroutines)
api(idofrontLibs.kotlinx.serialization.json)
}

}
val commonTest by getting {
dependencies {
implementation(kotlin("test"))
implementation(libs.kotlinx.coroutines.test)
implementation(libs.kotest.assertions)
implementation(libs.kotest.property)
implementation(libs.idofront.di)
implementation(idofrontLibs.kotlinx.coroutines.test)
implementation(idofrontLibs.kotest.assertions)
implementation(idofrontLibs.kotest.property)
implementation(idofrontLibs.idofront.di)
}
}

val jvmMain by getting {
dependencies {
implementation(libs.kotlinx.serialization.kaml)
implementation(libs.fastutil)
implementation(mylibs.roaringbitmap)
implementation(idofrontLibs.kotlinx.serialization.kaml)
implementation(idofrontLibs.fastutil)
implementation(libs.roaringbitmap)
}
}
val jsMain by getting {
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ group=com.mineinabyss
version=0.25
# Workaround for dokka builds failing on CI, see https://github.com/Kotlin/dokka/issues/1405
#org.gradle.jvmargs=-XX:MaxMetaspaceSize=512m
idofrontVersion=0.21.2
idofrontVersion=0.22.0
0 gradle/mylibs.versions.toml → gradle/libs.versions.toml
View file
File renamed without changes.
3 changes: 1 addition & 2 deletions settings.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,9 @@ dependencyResolutionManagement {
}

versionCatalogs {
create("libs") {
create("idofrontLibs") {
from("com.mineinabyss:catalog:$idofrontVersion")
}
create("mylibs").from(files("gradle/mylibs.versions.toml"))
}
}

Expand Down

0 comments on commit 2ebf97f

Please sign in to comment.