Compare commits

..

3 Commits

Author SHA1 Message Date
4324620932 fix of web publication 2023-11-02 17:43:12 +06:00
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
7 changed files with 20 additions and 14 deletions

View File

@@ -24,7 +24,7 @@ jobs:
uses: peaceiris/actions-gh-pages@v3 uses: peaceiris/actions-gh-pages@v3
with: with:
github_token: ${{ secrets.GITHUB_TOKEN }} github_token: ${{ secrets.GITHUB_TOKEN }}
publish_dir: ./core/build/distributions publish_dir: ./core/build/dist/js/productionExecutable
publish_branch: site publish_branch: site
- name: Create Release - name: Create Release
id: create_release id: create_release

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

@@ -1,15 +1,15 @@
[versions] [versions]
kt = "1.8.20" kt = "1.9.20"
kt-serialization = "1.5.1" kt-serialization = "1.6.0"
kt-coroutines = "1.7.2" kt-coroutines = "1.7.3"
jb-compose = "1.4.1" jb-compose = "1.5.10"
jb-dokka = "1.8.20" jb-dokka = "1.9.10"
microutils = "0.19.7" microutils = "0.20.11"
kjsuikit = "0.7.1" kjsuikit = "0.7.2"
ktor = "2.3.2" 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

@@ -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"