Compare commits

...

4 Commits

Author SHA1 Message Date
265e839dc7 fix of build 2023-11-02 17:40:56 +06:00
2144ca2cca update to support gradle 8.+ 2023-11-02 17:30:42 +06:00
bf21f92c6f update dependencies 2023-07-10 15:00:35 +06:00
41e8d2c540 update dependencies 2023-04-27 16:45:44 +06:00
8 changed files with 21 additions and 27 deletions

View File

@@ -20,6 +20,12 @@ if (project.hasProperty("signing.gnupg.keyName")) {
dependsOn(it) dependsOn(it)
} }
} }
// Workaround to make android sign operations depend on signing tasks
project.getTasks().withType(AbstractPublishToMaven.class).configureEach {
def signingTasks = project.getTasks().withType(Sign.class)
mustRunAfter(signingTasks)
}
} }
""" """
GpgSigning.Enabled -> GpgSigning.Enabled ->

View File

@@ -7,13 +7,13 @@ fun MavenConfig.buildJsOnlyMavenConfig(licenses: List<License>): String = """
apply plugin: 'maven-publish' apply plugin: 'maven-publish'
task javadocJar(type: Jar) { task javadocJar(type: Jar) {
classifier = 'javadoc' archiveClassifier = 'javadoc'
} }
task sourcesJar(type: Jar) { task sourcesJar(type: Jar) {
kotlin.sourceSets.all { kotlin.sourceSets.all {
from(kotlin) from(kotlin)
} }
classifier = 'sources' archiveClassifier = 'sources'
} }
publishing { publishing {

View File

@@ -7,7 +7,7 @@ fun MavenConfig.buildMultiplatformMavenConfig(licenses: List<License>): String =
apply plugin: 'maven-publish' apply plugin: 'maven-publish'
task javadocsJar(type: Jar) { task javadocsJar(type: Jar) {
classifier = 'javadoc' archiveClassifier = 'javadoc'
} }
publishing { publishing {

View File

@@ -4,18 +4,6 @@ kotlin.js.generate.externals=true
kotlin.incremental=true kotlin.incremental=true
kotlin.incremental.js=true kotlin.incremental.js=true
kotlin_version=1.7.20
kotlin_coroutines_version=1.6.4
kotlin_serialisation_core_version=1.4.1
ktor_version=2.1.3
micro_utils_version=0.14.2
compose_version=1.2.1
# Dokka
dokka_version=1.7.20
# Project data # Project data
group=dev.inmo group=dev.inmo

View File

@@ -1,15 +1,15 @@
[versions] [versions]
kt = "1.7.20" kt = "1.9.20"
kt-serialization = "1.4.1" kt-serialization = "1.6.0"
kt-coroutines = "1.6.4" kt-coroutines = "1.7.3"
jb-compose = "1.2.1" jb-compose = "1.5.10"
jb-dokka = "1.7.20" jb-dokka = "1.9.10"
microutils = "0.14.2" microutils = "0.20.11"
kjsuikit = "0.4.1" kjsuikit = "0.7.2"
ktor = "2.1.3" ktor = "2.3.5"
gh-release = "2.4.1" gh-release = "2.4.1"

View File

@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip

View File

@@ -13,7 +13,7 @@ kotlin {
commonMain { commonMain {
dependencies { dependencies {
implementation kotlin('stdlib') implementation kotlin('stdlib')
api "org.jetbrains.kotlinx:kotlinx-serialization-json:$kotlin_serialisation_core_version" api libs.kt.serialization
} }
} }
commonTest { commonTest {

View File

@@ -1,4 +1,4 @@
project.version = "$version" + System.getenv("additional_version") project.version = "$version" + (System.getenv("additional_version") == null ? "" : System.getenv("additional_version"))
project.group = "$group" project.group = "$group"
// apply from: "$publishGradlePath" // apply from: "$publishGradlePath"
@@ -14,7 +14,7 @@ kotlin {
commonMain { commonMain {
dependencies { dependencies {
implementation kotlin('stdlib') implementation kotlin('stdlib')
api "org.jetbrains.kotlinx:kotlinx-serialization-json:$kotlin_serialisation_core_version" api libs.kt.serialization
} }
} }
commonTest { commonTest {