Update dependencies

This commit is contained in:
2024-12-08 10:07:56 +01:00
parent 1eed613b2a
commit 76866eb392
14 changed files with 127 additions and 44 deletions

View File

@@ -1,8 +1,6 @@
<component name="ArtifactManager">
<artifact type="jar" name="audio-worklet-js-1.0.0-SNAPSHOT">
<output-path>$PROJECT_DIR$/audio-worklet/build/libs</output-path>
<root id="archive" name="audio-worklet-js-1.0.0-SNAPSHOT.jar">
<element id="module-output" name="vst-string.audio-worklet.jsMain" />
</root>
<root id="archive" name="audio-worklet-js-1.0.0-SNAPSHOT.jar" />
</artifact>
</component>

View File

@@ -1,8 +1,6 @@
<component name="ArtifactManager">
<artifact type="jar" name="audio-worklet-jvm-1.0.0-SNAPSHOT">
<output-path>$PROJECT_DIR$/audio-worklet/build/libs</output-path>
<root id="archive" name="audio-worklet-jvm-1.0.0-SNAPSHOT.jar">
<element id="module-output" name="vst-string.audio-worklet.jvmMain" />
</root>
<root id="archive" name="audio-worklet-jvm-1.0.0-SNAPSHOT.jar" />
</artifact>
</component>

View File

@@ -1,8 +1,6 @@
<component name="ArtifactManager">
<artifact type="jar" name="common-js-1.0.0-SNAPSHOT">
<output-path>$PROJECT_DIR$/common/build/libs</output-path>
<root id="archive" name="common-js-1.0.0-SNAPSHOT.jar">
<element id="module-output" name="vst-string.common.jsMain" />
</root>
<root id="archive" name="common-js-1.0.0-SNAPSHOT.jar" />
</artifact>
</component>

View File

@@ -1,8 +1,6 @@
<component name="ArtifactManager">
<artifact type="jar" name="common-jvm-1.0.0-SNAPSHOT">
<output-path>$PROJECT_DIR$/common/build/libs</output-path>
<root id="archive" name="common-jvm-1.0.0-SNAPSHOT.jar">
<element id="module-output" name="vst-string.common.jvmMain" />
</root>
<root id="archive" name="common-jvm-1.0.0-SNAPSHOT.jar" />
</artifact>
</component>

View File

@@ -1,7 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="JavaScriptLibraryMappings">
<excludedPredefinedLibrary name="vst-chip/build/js/node_modules" />
<excludedPredefinedLibrary name="vst-chip/build/js/packages/vst-base-test/node_modules" />
</component>
</project>

View File

@@ -1,6 +1,5 @@
@file:OptIn(ExperimentalKotlinGradlePluginApi::class, ExperimentalDistributionDsl::class)
@file:OptIn(ExperimentalDistributionDsl::class)
import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalDistributionDsl
import org.jetbrains.kotlin.gradle.targets.js.webpack.KotlinWebpackOutput
@@ -42,7 +41,7 @@ kotlin {
dependencies {
implementation(project(":common"))
implementation("nl.astraeus:vst-worklet-base:1.0.0-SNAPSHOT")
implementation("nl.astraeus:vst-worklet-base:1.0.1")
}
}
val jsMain by getting {

View File

@@ -1,5 +1,9 @@
import java.nio.file.Files
import java.nio.file.Paths
buildscript {
apply(from = "common.gradle.kts")
apply(from = "version.gradle.kts")
}
plugins {
@@ -28,7 +32,7 @@ kotlin {
}
}
}
jvm{
jvm {
withJava()
}
@@ -37,15 +41,15 @@ kotlin {
dependencies {
implementation(project(":common"))
//base
api("nl.astraeus:kotlin-css-generator:1.0.7")
implementation("nl.astraeus:kotlin-css-generator:1.0.10")
implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.4.0")
implementation("nl.astraeus:vst-ui-base:1.1.0-SNAPSHOT")
implementation("nl.astraeus:vst-ui-base:1.1.1")
}
}
val jsMain by getting {
dependencies {
//base
implementation("nl.astraeus:kotlin-komponent-js:1.2.2")
implementation("nl.astraeus:kotlin-komponent-js:1.2.4")
}
}
val jsTest by getting {
@@ -70,3 +74,84 @@ kotlin {
}
}
}
/* Hardcoded deploy configuration */
val deployDirectory = "vst-string.midi-vst.com"
tasks.register<Copy>("unzipDistribution") {
mustRunAfter("removeSymbolicLink")
val zipDir = layout.projectDirectory.dir("build/distributions")
val zipFile = zipDir.file("${project.name}-${project.version}.zip")
val outputDir = file("/home/rnentjes/www/${deployDirectory}")
from(zipTree(zipFile))
into(outputDir)
}
tasks.register("createSymbolicLink") {
mustRunAfter("unzipDistribution")
doLast {
val targetDir =
Paths.get("/home/rnentjes/www/${deployDirectory}/${project.name}-${project.version}") // Directory to link to
val symlink =
Paths.get("/home/rnentjes/www/${deployDirectory}/${project.name}") // Path for the symbolic link
if (!Files.exists(targetDir)) {
throw IllegalArgumentException("Target directory does not exist: $targetDir")
}
if (Files.exists(symlink)) {
println("Symbolic link already exists: $symlink")
} else {
Files.createSymbolicLink(symlink, targetDir)
println("Symbolic link created: $symlink -> $targetDir")
}
}
}
tasks.register<Copy>("copyWeb") {
val webDir = layout.projectDirectory.dir("web")
val outputDir = file("/home/rnentjes/www/${deployDirectory}/web")
from(webDir)
into(outputDir)
}
tasks.named<Task>("build") {
dependsOn("generateVersionProperties")
}
tasks.named("kotlinUpgradeYarnLock") {
mustRunAfter("clean")
}
tasks.named("build") {
mustRunAfter("kotlinUpgradeYarnLock")
}
tasks.named("build") {
mustRunAfter("kotlinUpgradeYarnLock")
}
tasks.named("copyWeb") {
mustRunAfter("build")
}
tasks.register("removeSymbolicLink") {
mustRunAfter("build")
doLast {
delete(layout.projectDirectory.file("/home/rnentjes/www/${deployDirectory}/${project.name}"))
}
}
tasks.register("deploy") {
dependsOn("clean")
dependsOn("kotlinUpgradeYarnLock")
dependsOn("build")
dependsOn("copyWeb")
dependsOn("removeSymbolicLink")
dependsOn("unzipDistribution")
dependsOn("createSymbolicLink")
}

View File

@@ -1,13 +1,12 @@
group = "nl.astraeus"
version = "1.0.0-SNAPSHOT"
version = "0.1.0"
allprojects {
repositories {
mavenLocal()
mavenCentral()
maven("https://reposilite.astraeus.nl/releases")
maven {
url = uri("https://nexus.astraeus.nl/nexus/content/groups/public")
url = uri("https://gitea.astraeus.nl:8443/api/packages/rnentjes/maven")
}
}
}

View File

@@ -1,7 +1,3 @@
@file:OptIn(ExperimentalKotlinGradlePluginApi::class)
import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
buildscript {
apply(from = "../common.gradle.kts")
}
@@ -20,13 +16,8 @@ kotlin {
jvm()
sourceSets {
val commonMain by getting {
dependencies {
}
}
val jsMain by getting {
dependencies {
}
}
val commonMain by getting
val jsMain by getting
val jvmMain by getting
}
}

View File

@@ -1,3 +1,5 @@
@file:OptIn(ExperimentalJsExport::class)
package nl.astraeus.vst
import kotlin.js.ExperimentalJsExport

View File

@@ -1,3 +1,5 @@
@file:OptIn(ExperimentalJsExport::class)
package nl.astraeus.vst.string
import nl.astraeus.vst.Note

View File

@@ -1,7 +1,6 @@
pluginManagement {
plugins {
kotlin("multiplatform") version "2.0.20-Beta1"
id("org.gradle.toolchains.foojay-resolver-convention") version "0.5.0"
kotlin("multiplatform") version "2.0.21"
}
repositories {
gradlePluginPortal()

View File

@@ -13,7 +13,7 @@ import nl.astraeus.vst.ui.view.BaseVstView
fun main() {
CssSettings.shortId = false
CssSettings.preFix = "vst-chip"
CssSettings.preFix = "vst-string"
Komponent.unsafeMode = UnsafeMode.UNSAFE_SVG_ONLY
Komponent.create(document.body!!, BaseVstView("VST Guiter", MainView) {

21
version.gradle.kts Normal file
View File

@@ -0,0 +1,21 @@
import java.util.Date
import java.util.Properties
tasks.register("generateVersionProperties") {
doLast {
val versionDir = layout.buildDirectory.dir("processedResources/jvm/main")
val versionFile = versionDir.get().file("version.properties").asFile
versionDir.get().asFile.mkdirs()
val properties = Properties().apply {
setProperty("group", project.group.toString())
setProperty("name", project.name.toString())
setProperty("version", project.version.toString())
setProperty("buildTime", Date().toString())
}
versionFile.writer().use { writer ->
properties.store(writer, "Version information")
}
}
}