diff --git a/.github/workflows/deploy-release.yaml b/.github/workflows/deploy-release.yaml index 62ef99a..48947fd 100644 --- a/.github/workflows/deploy-release.yaml +++ b/.github/workflows/deploy-release.yaml @@ -28,4 +28,4 @@ jobs: ORG_GPG_PRIVATE_KEY: ${{ secrets.ORG_GPG_PRIVATE_KEY }} ORG_OSSRH_PASSWORD: ${{ secrets.ORG_OSSRH_PASSWORD }} ORG_OSSRH_USERNAME: ${{ secrets.ORG_OSSRH_USERNAME }} - run: ./gradlew publishAllPublicationsToOSSRHReleaseRepository + run: ./gradlew publishToSonatype closeAndReleaseSonatypeStagingRepository --no-configuration-cache diff --git a/.github/workflows/deploy-snapshot.yaml b/.github/workflows/deploy-snapshot.yaml index 7ae4d1f..0977bd2 100644 --- a/.github/workflows/deploy-snapshot.yaml +++ b/.github/workflows/deploy-snapshot.yaml @@ -31,4 +31,4 @@ jobs: ORG_GPG_PRIVATE_KEY: ${{ secrets.ORG_GPG_PRIVATE_KEY }} ORG_OSSRH_PASSWORD: ${{ secrets.ORG_OSSRH_PASSWORD }} ORG_OSSRH_USERNAME: ${{ secrets.ORG_OSSRH_USERNAME }} - run: ./gradlew publishAllPublicationsToOSSRHSnapshotRepository + run: ./gradlew publishToSonatype --no-configuration-cache diff --git a/build.gradle.kts b/build.gradle.kts index 7316058..964ba69 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 Contributors to the Eclipse Foundation + * Copyright (c) 2023 - 2025 Contributors to the Eclipse Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -39,6 +39,16 @@ plugins { version kotlin("jvm") jacoco + alias(libs.plugins.gradle.nexus.publish.plugin) +} + +nexusPublishing { + repositories { + sonatype { + username = System.getenv("ORG_OSSRH_USERNAME") + password = System.getenv("ORG_OSSRH_PASSWORD") + } + } } subprojects { @@ -60,6 +70,12 @@ subprojects { } systemProperties = systemPropertiesMap } + + // https://docs.gradle.org/current/userguide/dependency_locking.html + dependencyLocking { + lockAllConfigurations() + lockFile = file("$projectDir/gradle.lockfile") + } } @OptIn(ExperimentalPathApi::class) diff --git a/buildSrc/src/main/kotlin/publish.gradle.kts b/buildSrc/src/main/kotlin/publish.gradle.kts index b980e02..5727b92 100644 --- a/buildSrc/src/main/kotlin/publish.gradle.kts +++ b/buildSrc/src/main/kotlin/publish.gradle.kts @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 Contributors to the Eclipse Foundation + * Copyright (c) 2023 - 2025 Contributors to the Eclipse Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -23,6 +23,9 @@ plugins { } interface PublishPluginExtension { + val artifactGroup: Property + val artifactName: Property + val artifactVersion: Property val mavenPublicationName: Property val componentName: Property val description: Property @@ -32,29 +35,12 @@ val extension = project.extensions.create("publish") afterEvaluate { publishing { - repositories { - maven { - name = "OSSRHRelease" - - url = uri("https://oss.sonatype.org/service/local/staging/deploy/maven2/") - credentials { - username = System.getenv("ORG_OSSRH_USERNAME") - password = System.getenv("ORG_OSSRH_PASSWORD") - } - } - maven { - name = "OSSRHSnapshot" - - url = uri("https://oss.sonatype.org/content/repositories/snapshots/") - credentials { - username = System.getenv("ORG_OSSRH_USERNAME") - password = System.getenv("ORG_OSSRH_PASSWORD") - } - } - } publications { register(extension.mavenPublicationName.get()) { from(components[extension.componentName.get()]) + groupId = extension.artifactGroup.getOrElse(project.group.toString()) + artifactId = extension.artifactName.getOrElse(project.name) + version = extension.artifactVersion.getOrElse(project.version.toString()) pom { name = "${project.group}:${project.name}" diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 050e3eb..efe6946 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -2,9 +2,8 @@ androidGradlePlugin = "8.3.2" # Check with detekt table first: https://detekt.dev/docs/introduction/compatibility/ detekt = "1.23.6" dockerJavaCore = "3.4.1" -dokka = "1.9.10" +dokka = "1.9.20" kotlin = "1.9.22" -tomcatAnnotations = "6.0.53" ktlint = "0.0" # Maintained inside ktlint.gradle.kts grpc = "1.65.1" grpcKotlin = "1.4.1" @@ -25,7 +24,6 @@ grpc-kotlin-stub = { group = "io.grpc", name = "grpc-kotlin-stub", version.ref = protoc-gen-grpc-kotlin = { group = "io.grpc", name = "protoc-gen-grpc-kotlin", version.ref = "grpcKotlin" } protobuf-kotlin-lite = { group = "com.google.protobuf", name = "protobuf-kotlin-lite", version.ref = "protobuf" } -tomcat-annotations = { group = "org.apache.tomcat", name = "annotations-api", version.ref = "tomcatAnnotations" } kotlinx-coroutines-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version.ref = "kotlinxCoroutines" } kotlinx-coroutines-test = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-test", version.ref = "kotlinxCoroutines" } @@ -44,4 +42,4 @@ grpc-protoc-java-gen = { group = "io.grpc", name = "protoc-gen-grpc-java", versi [plugins] dokka = { id = "org.jetbrains.dokka", version.ref = "dokka" } -pluginPublishing = { id = "com.gradle.plugin-publish", version = "1.2.1" } +gradle-nexus-publish-plugin = { id = "io.github.gradle-nexus.publish-plugin", version = "2.0.0" } diff --git a/kuksa-java-sdk/build.gradle.kts b/kuksa-java-sdk/build.gradle.kts index 7a56c5d..d42bb9c 100644 --- a/kuksa-java-sdk/build.gradle.kts +++ b/kuksa-java-sdk/build.gradle.kts @@ -88,22 +88,19 @@ java { } dependencies { - api(project(":vss-core")) // Models are exposed - - testImplementation(project(":test-core")) - - // needs to be api as long as we expose ProtoBuf specific objects - api(libs.grpc.protobuf) - api(libs.protobuf.kotlin.lite) - implementation(kotlin("reflect")) + api(project(":vss-core")) // models are exposed + api(libs.grpc.protobuf) // needs to be api as long as we expose ProtoBuf specific objects + + implementation(libs.protobuf.kotlin.lite) implementation(libs.grpc.okhttp) implementation(libs.grpc.stub) implementation(libs.grpc.kotlin.stub) - implementation(libs.tomcat.annotations) implementation(libs.kotlinx.coroutines.core) + testImplementation(project(":test-core")) + testImplementation(libs.kotlinx.coroutines.test) testImplementation(libs.kotest) testImplementation(libs.mockk) diff --git a/kuksa-java-sdk/gradle.lockfile b/kuksa-java-sdk/gradle.lockfile new file mode 100644 index 0000000..4147ad5 --- /dev/null +++ b/kuksa-java-sdk/gradle.lockfile @@ -0,0 +1,159 @@ +# This is a Gradle generated file for dependency locking. +# Manual edits can break the build and are not advised. +# This file is expected to be part of source control. +ch.qos.logback:logback-classic:1.3.5=ktlint +ch.qos.logback:logback-core:1.3.5=ktlint +com.fasterxml.jackson.core:jackson-annotations:2.10.3=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +com.fasterxml.jackson.core:jackson-core:2.10.3=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +com.fasterxml.jackson.core:jackson-databind:2.10.3=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +com.github.ajalt:colormath:1.2.0=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +com.github.ajalt:mordant:1.2.1=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +com.github.docker-java:docker-java-api:3.4.1=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +com.github.docker-java:docker-java-core:3.4.1=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +com.github.docker-java:docker-java-transport-httpclient5:3.4.1=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +com.github.docker-java:docker-java-transport:3.4.1=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +com.google.android:annotations:4.1.1.4=compileProtoPath,testCompileProtoPath,testRuntimeClasspath +com.google.code.findbugs:jsr305:3.0.2=compileClasspath,compileProtoPath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +com.google.code.gson:gson:2.10.1=compileProtoPath,testCompileProtoPath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.23.0=compileClasspath,compileProtoPath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.1=compileClasspath,compileProtoPath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +com.google.guava:guava:32.1.3-android=compileClasspath,compileProtoPath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=compileClasspath,compileProtoPath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +com.google.j2objc:j2objc-annotations:2.8=compileClasspath,testCompileClasspath +com.google.protobuf:protobuf-javalite:3.25.3=compileClasspath,compileProtoPath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +com.google.protobuf:protobuf-kotlin-lite:3.25.3=compileClasspath,compileProtoPath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +com.google.protobuf:protoc:3.25.3=protobufToolsLocator_protoc +com.pinterest.ktlint:ktlint-cli-reporter:0.49.0=ktlint +com.pinterest.ktlint:ktlint-cli-ruleset-core:0.49.0=ktlint +com.pinterest.ktlint:ktlint-core:0.49.0=ktlint +com.pinterest.ktlint:ktlint-logger:0.49.0=ktlint +com.pinterest.ktlint:ktlint-reporter-baseline:0.49.0=ktlint +com.pinterest.ktlint:ktlint-reporter-checkstyle:0.49.0=ktlint +com.pinterest.ktlint:ktlint-reporter-format:0.49.0=ktlint +com.pinterest.ktlint:ktlint-reporter-html:0.49.0=ktlint +com.pinterest.ktlint:ktlint-reporter-json:0.49.0=ktlint +com.pinterest.ktlint:ktlint-reporter-plain-summary:0.49.0=ktlint +com.pinterest.ktlint:ktlint-reporter-plain:0.49.0=ktlint +com.pinterest.ktlint:ktlint-reporter-sarif:0.49.0=ktlint +com.pinterest.ktlint:ktlint-rule-engine-core:0.49.0=ktlint +com.pinterest.ktlint:ktlint-rule-engine:0.49.0=ktlint +com.pinterest.ktlint:ktlint-ruleset-standard:0.49.0=ktlint +com.pinterest:ktlint:0.49.0=ktlint +com.squareup.okio:okio-jvm:3.4.0=compileProtoPath,testCompileProtoPath,testRuntimeClasspath +com.squareup.okio:okio:3.4.0=compileProtoPath,testCompileProtoPath,testRuntimeClasspath +commons-codec:commons-codec:1.13=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +commons-io:commons-io:2.13.0=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +info.picocli:picocli:4.7.1=ktlint +io.github.classgraph:classgraph:4.8.162=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +io.github.detekt.sarif4k:sarif4k:0.2.0=ktlint +io.github.java-diff-utils:java-diff-utils:4.12=testCompileProtoPath,testRuntimeClasspath +io.github.microutils:kotlin-logging-jvm:3.0.5=ktlint +io.grpc:grpc-api:1.65.1=compileClasspath,compileProtoPath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +io.grpc:grpc-context:1.65.1=compileProtoPath,testCompileProtoPath,testRuntimeClasspath +io.grpc:grpc-core:1.65.1=compileProtoPath,testCompileProtoPath,testRuntimeClasspath +io.grpc:grpc-kotlin-stub:1.4.1=compileClasspath,compileProtoPath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +io.grpc:grpc-okhttp:1.65.1=compileClasspath,compileProtoPath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +io.grpc:grpc-protobuf-lite:1.65.1=compileClasspath,compileProtoPath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +io.grpc:grpc-stub:1.65.1=compileClasspath,compileProtoPath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +io.grpc:grpc-util:1.65.1=compileProtoPath,testCompileProtoPath,testRuntimeClasspath +io.grpc:protoc-gen-grpc-java:1.65.1=protobufToolsLocator_grpc +io.grpc:protoc-gen-grpc-kotlin:1.4.1=protobufToolsLocator_grpckt +io.kotest:kotest-assertions-api-jvm:5.7.2=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +io.kotest:kotest-assertions-api:5.7.2=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +io.kotest:kotest-assertions-core-jvm:5.7.2=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +io.kotest:kotest-assertions-core:5.7.2=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +io.kotest:kotest-assertions-shared-jvm:5.7.2=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +io.kotest:kotest-assertions-shared:5.7.2=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +io.kotest:kotest-common-jvm:5.7.2=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +io.kotest:kotest-common:5.7.2=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +io.kotest:kotest-extensions-jvm:5.7.2=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +io.kotest:kotest-extensions:5.7.2=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +io.kotest:kotest-framework-api-jvm:5.7.2=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +io.kotest:kotest-framework-api:5.7.2=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +io.kotest:kotest-framework-concurrency-jvm:5.7.2=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +io.kotest:kotest-framework-concurrency:5.7.2=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +io.kotest:kotest-framework-discovery-jvm:5.7.2=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +io.kotest:kotest-framework-discovery:5.7.2=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +io.kotest:kotest-framework-engine-jvm:5.7.2=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +io.kotest:kotest-framework-engine:5.7.2=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +io.kotest:kotest-runner-junit5-jvm:5.7.2=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +io.kotest:kotest-runner-junit5:5.7.2=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +io.mockk:mockk-agent-api-jvm:1.13.7=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +io.mockk:mockk-agent-api:1.13.7=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +io.mockk:mockk-agent-jvm:1.13.7=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +io.mockk:mockk-agent:1.13.7=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +io.mockk:mockk-core-jvm:1.13.7=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +io.mockk:mockk-core:1.13.7=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +io.mockk:mockk-dsl-jvm:1.13.7=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +io.mockk:mockk-dsl:1.13.7=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +io.mockk:mockk-jvm:1.13.7=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +io.mockk:mockk:1.13.7=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +io.perfmark:perfmark-api:0.26.0=compileProtoPath,testCompileProtoPath,testRuntimeClasspath +javax.annotation:javax.annotation-api:1.3.2=compileClasspath,compileProtoPath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +junit:junit:4.13.2=testCompileProtoPath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.12.20=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.12.20=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +net.java.dev.jna:jna-platform:5.9.0=testCompileProtoPath,testRuntimeClasspath +net.java.dev.jna:jna:5.13.0=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +net.java.dev.jna:jna:5.6.0=ktlint +org.apache.commons:commons-compress:1.21=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +org.apache.commons:commons-lang3:3.12.0=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +org.apache.httpcomponents.client5:httpclient5:5.0.3=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +org.apache.httpcomponents.core5:httpcore5-h2:5.0.2=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +org.apache.httpcomponents.core5:httpcore5:5.0.2=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath +org.bouncycastle:bcpkix-jdk18on:1.76=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +org.bouncycastle:bcprov-jdk18on:1.76=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +org.bouncycastle:bcutil-jdk18on:1.76=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +org.checkerframework:checker-qual:3.37.0=compileClasspath,compileProtoPath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +org.codehaus.mojo:animal-sniffer-annotations:1.23=compileProtoPath,testCompileProtoPath,testRuntimeClasspath +org.ec4j.core:ec4j-core:0.3.0=ktlint +org.hamcrest:hamcrest-core:1.3=testCompileProtoPath,testRuntimeClasspath +org.jacoco:org.jacoco.agent:0.8.11=jacocoAgent +org.jetbrains.intellij.deps:trove4j:1.0.20200330=kotlinCompilerClasspath,ktlint +org.jetbrains.kotlin:kotlin-compiler-embeddable:1.8.20=ktlint +org.jetbrains.kotlin:kotlin-compiler-embeddable:1.9.22=kotlinCompilerClasspath +org.jetbrains.kotlin:kotlin-daemon-embeddable:1.8.20=ktlint +org.jetbrains.kotlin:kotlin-daemon-embeddable:1.9.22=kotlinCompilerClasspath +org.jetbrains.kotlin:kotlin-reflect:1.6.10=kotlinCompilerClasspath,ktlint +org.jetbrains.kotlin:kotlin-reflect:1.9.22=compileClasspath,compileProtoPath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-script-runtime:1.8.20=ktlint +org.jetbrains.kotlin:kotlin-script-runtime:1.9.22=kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest +org.jetbrains.kotlin:kotlin-scripting-common:1.9.22=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest +org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.9.22=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest +org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.9.22=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest +org.jetbrains.kotlin:kotlin-scripting-jvm:1.9.22=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest +org.jetbrains.kotlin:kotlin-stdlib-common:1.8.20=ktlint +org.jetbrains.kotlin:kotlin-stdlib-common:1.9.22=compileClasspath,compileProtoPath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.20=compileClasspath,compileProtoPath,ktlint,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.20=compileClasspath,compileProtoPath,ktlint,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib:1.8.20=ktlint +org.jetbrains.kotlin:kotlin-stdlib:1.9.22=compileClasspath,compileProtoPath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.3=compileClasspath,compileProtoPath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.7.3=compileClasspath,compileProtoPath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3=compileClasspath,compileProtoPath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +org.jetbrains.kotlinx:kotlinx-coroutines-debug:1.7.3=testCompileProtoPath,testRuntimeClasspath +org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:1.7.3=testCompileProtoPath,testRuntimeClasspath +org.jetbrains.kotlinx:kotlinx-coroutines-test-jvm:1.7.3=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.3=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.4.1=ktlint +org.jetbrains.kotlinx:kotlinx-serialization-core:1.4.1=ktlint +org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:1.4.1=ktlint +org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.1=ktlint +org.jetbrains:annotations:13.0=kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,ktlint +org.jetbrains:annotations:23.0.0=compileClasspath,compileProtoPath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +org.junit.jupiter:junit-jupiter-api:5.8.2=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +org.junit.jupiter:junit-jupiter-engine:5.8.2=testCompileProtoPath,testRuntimeClasspath +org.junit.jupiter:junit-jupiter-params:5.8.2=testCompileProtoPath,testRuntimeClasspath +org.junit.jupiter:junit-jupiter:5.8.2=testCompileProtoPath,testRuntimeClasspath +org.junit.platform:junit-platform-commons:1.8.2=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +org.junit.platform:junit-platform-engine:1.8.2=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +org.junit.platform:junit-platform-launcher:1.8.2=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +org.junit.platform:junit-platform-suite-api:1.8.2=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +org.junit:junit-bom:5.8.2=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +org.objenesis:objenesis:3.3=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +org.opentest4j:opentest4j:1.2.0=testCompileClasspath +org.opentest4j:opentest4j:1.3.0=testCompileProtoPath,testRuntimeClasspath +org.slf4j:slf4j-api:1.7.30=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +org.slf4j:slf4j-api:2.0.4=ktlint +empty=annotationProcessor,kotlinScriptDefExtensions,protobuf,testAnnotationProcessor,testKotlinScriptDefExtensions,testProtobuf diff --git a/kuksa-java-sdk/src/main/kotlin/org/eclipse/kuksa/extension/vss/VssNodeCopyExtension.kt b/kuksa-java-sdk/src/main/kotlin/org/eclipse/kuksa/extension/vss/VssNodeCopyExtension.kt index 5eb2d51..4536f41 100644 --- a/kuksa-java-sdk/src/main/kotlin/org/eclipse/kuksa/extension/vss/VssNodeCopyExtension.kt +++ b/kuksa-java-sdk/src/main/kotlin/org/eclipse/kuksa/extension/vss/VssNodeCopyExtension.kt @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 Contributors to the Eclipse Foundation + * Copyright (c) 2023 - 2025 Contributors to the Eclipse Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,6 +14,7 @@ * limitations under the License. * * SPDX-License-Identifier: Apache-2.0 + * */ package org.eclipse.kuksa.extension.vss @@ -57,7 +58,8 @@ fun T.deepCopy(generation: Int = 0, changedHeritage: List // Create the missing link between this [VssNode] and the given node inbetween var heritageLine = changedHeritage if (changedHeritage.size == 1) { - heritageLine = findHeritageLine(changedHeritage.first(), true) + val heir = changedHeritage.firstOrNull()!! // safe cast to non-null because size == 1 + heritageLine = findHeritageLine(heir, true) .toList() .ifEmpty { changedHeritage } } diff --git a/kuksa-java-sdk/src/test/kotlin/org/eclipse/kuksa/connectivity/databroker/docker/SecureDataBrokerDockerContainer.kt b/kuksa-java-sdk/src/test/kotlin/org/eclipse/kuksa/connectivity/databroker/docker/SecureDataBrokerDockerContainer.kt index 123417e..7bf83b4 100644 --- a/kuksa-java-sdk/src/test/kotlin/org/eclipse/kuksa/connectivity/databroker/docker/SecureDataBrokerDockerContainer.kt +++ b/kuksa-java-sdk/src/test/kotlin/org/eclipse/kuksa/connectivity/databroker/docker/SecureDataBrokerDockerContainer.kt @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 - 2024 Contributors to the Eclipse Foundation + * Copyright (c) 2023 - 2025 Contributors to the Eclipse Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -57,7 +57,6 @@ class SecureDataBrokerDockerContainer( "--tls-private-key", "$tlsMount/Server.key", "--jwt-public-key", "$authenticationMount/jwt.key.pub", ) - val toString = withCmd.toString() return withCmd .exec() } diff --git a/samples/gradle.lockfile b/samples/gradle.lockfile new file mode 100644 index 0000000..d2076c9 --- /dev/null +++ b/samples/gradle.lockfile @@ -0,0 +1,83 @@ +# This is a Gradle generated file for dependency locking. +# Manual edits can break the build and are not advised. +# This file is expected to be part of source control. +ch.qos.logback:logback-classic:1.3.5=ktlint +ch.qos.logback:logback-core:1.3.5=ktlint +com.google.android:annotations:4.1.1.4=runtimeClasspath,testRuntimeClasspath +com.google.code.findbugs:jsr305:3.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.code.gson:gson:2.10.1=runtimeClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.23.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.1=runtimeClasspath,testRuntimeClasspath +com.google.guava:guava:32.1.3-android=runtimeClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=runtimeClasspath,testRuntimeClasspath +com.google.protobuf:protobuf-javalite:3.25.1=compileClasspath,testCompileClasspath +com.google.protobuf:protobuf-javalite:3.25.3=runtimeClasspath,testRuntimeClasspath +com.google.protobuf:protobuf-kotlin-lite:3.25.3=runtimeClasspath,testRuntimeClasspath +com.pinterest.ktlint:ktlint-cli-reporter:0.49.0=ktlint +com.pinterest.ktlint:ktlint-cli-ruleset-core:0.49.0=ktlint +com.pinterest.ktlint:ktlint-core:0.49.0=ktlint +com.pinterest.ktlint:ktlint-logger:0.49.0=ktlint +com.pinterest.ktlint:ktlint-reporter-baseline:0.49.0=ktlint +com.pinterest.ktlint:ktlint-reporter-checkstyle:0.49.0=ktlint +com.pinterest.ktlint:ktlint-reporter-format:0.49.0=ktlint +com.pinterest.ktlint:ktlint-reporter-html:0.49.0=ktlint +com.pinterest.ktlint:ktlint-reporter-json:0.49.0=ktlint +com.pinterest.ktlint:ktlint-reporter-plain-summary:0.49.0=ktlint +com.pinterest.ktlint:ktlint-reporter-plain:0.49.0=ktlint +com.pinterest.ktlint:ktlint-reporter-sarif:0.49.0=ktlint +com.pinterest.ktlint:ktlint-rule-engine-core:0.49.0=ktlint +com.pinterest.ktlint:ktlint-rule-engine:0.49.0=ktlint +com.pinterest.ktlint:ktlint-ruleset-standard:0.49.0=ktlint +com.pinterest:ktlint:0.49.0=ktlint +com.squareup.okio:okio-jvm:3.4.0=runtimeClasspath,testRuntimeClasspath +com.squareup.okio:okio:3.4.0=runtimeClasspath,testRuntimeClasspath +info.picocli:picocli:4.7.1=ktlint +io.github.detekt.sarif4k:sarif4k:0.2.0=ktlint +io.github.microutils:kotlin-logging-jvm:3.0.5=ktlint +io.grpc:grpc-api:1.65.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-context:1.65.1=runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-core:1.65.1=runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-kotlin-stub:1.4.1=runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-okhttp:1.65.1=runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-protobuf-lite:1.65.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-stub:1.65.1=runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-util:1.65.1=runtimeClasspath,testRuntimeClasspath +io.perfmark:perfmark-api:0.26.0=runtimeClasspath,testRuntimeClasspath +javax.annotation:javax.annotation-api:1.3.2=runtimeClasspath,testRuntimeClasspath +net.java.dev.jna:jna:5.6.0=ktlint +org.checkerframework:checker-qual:3.37.0=runtimeClasspath,testRuntimeClasspath +org.codehaus.mojo:animal-sniffer-annotations:1.23=runtimeClasspath,testRuntimeClasspath +org.ec4j.core:ec4j-core:0.3.0=ktlint +org.jacoco:org.jacoco.agent:0.8.11=jacocoAgent +org.jetbrains.intellij.deps:trove4j:1.0.20200330=kotlinCompilerClasspath,ktlint +org.jetbrains.kotlin:kotlin-compiler-embeddable:1.8.20=ktlint +org.jetbrains.kotlin:kotlin-compiler-embeddable:1.9.22=kotlinCompilerClasspath +org.jetbrains.kotlin:kotlin-daemon-embeddable:1.8.20=ktlint +org.jetbrains.kotlin:kotlin-daemon-embeddable:1.9.22=kotlinCompilerClasspath +org.jetbrains.kotlin:kotlin-reflect:1.6.10=kotlinCompilerClasspath,ktlint +org.jetbrains.kotlin:kotlin-reflect:1.9.22=runtimeClasspath,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-script-runtime:1.8.20=ktlint +org.jetbrains.kotlin:kotlin-script-runtime:1.9.22=kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest +org.jetbrains.kotlin:kotlin-scripting-common:1.9.22=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest +org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.9.22=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest +org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.9.22=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest +org.jetbrains.kotlin:kotlin-scripting-jvm:1.9.22=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest +org.jetbrains.kotlin:kotlin-stdlib-common:1.8.20=ktlint +org.jetbrains.kotlin:kotlin-stdlib-common:1.9.22=runtimeClasspath,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.0=runtimeClasspath,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.20=ktlint +org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.0=runtimeClasspath,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.20=ktlint +org.jetbrains.kotlin:kotlin-stdlib:1.8.20=ktlint +org.jetbrains.kotlin:kotlin-stdlib:1.9.22=compileClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.8.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.8.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.4.1=ktlint +org.jetbrains.kotlinx:kotlinx-serialization-core:1.4.1=ktlint +org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:1.4.1=ktlint +org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.1=ktlint +org.jetbrains:annotations:13.0=kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,ktlint +org.jetbrains:annotations:23.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.slf4j:slf4j-api:2.0.4=ktlint +empty=annotationProcessor,kotlinScriptDefExtensions,testAnnotationProcessor,testKotlinScriptDefExtensions diff --git a/samples/src/main/java/com/example/samples/Main.kt b/samples/src/main/java/com/example/samples/Main.kt index a768167..a083e85 100644 --- a/samples/src/main/java/com/example/samples/Main.kt +++ b/samples/src/main/java/com/example/samples/Main.kt @@ -35,10 +35,6 @@ import org.eclipse.kuksa.proto.v1.KuksaValV1 import org.eclipse.kuksa.proto.v1.Types.Datapoint import org.eclipse.kuksa.proto.v2.Types import org.eclipse.kuksa.proto.v2.Types.SignalID -import org.eclipse.kuksa.vsscore.annotation.VssModelGenerator - -@VssModelGenerator -class Main suspend fun main() { useKuksaValV1() diff --git a/settings-gradle.lockfile b/settings-gradle.lockfile new file mode 100644 index 0000000..709a43f --- /dev/null +++ b/settings-gradle.lockfile @@ -0,0 +1,4 @@ +# This is a Gradle generated file for dependency locking. +# Manual edits can break the build and are not advised. +# This file is expected to be part of source control. +empty=incomingCatalogForLibs0 diff --git a/test-core/gradle.lockfile b/test-core/gradle.lockfile new file mode 100644 index 0000000..a384567 --- /dev/null +++ b/test-core/gradle.lockfile @@ -0,0 +1,98 @@ +# This is a Gradle generated file for dependency locking. +# Manual edits can break the build and are not advised. +# This file is expected to be part of source control. +ch.qos.logback:logback-classic:1.3.5=ktlint +ch.qos.logback:logback-core:1.3.5=ktlint +com.github.ajalt:colormath:1.2.0=compileClasspath,testCompileClasspath,testRuntimeClasspath +com.github.ajalt:mordant:1.2.1=compileClasspath,testCompileClasspath,testRuntimeClasspath +com.pinterest.ktlint:ktlint-cli-reporter:0.49.0=ktlint +com.pinterest.ktlint:ktlint-cli-ruleset-core:0.49.0=ktlint +com.pinterest.ktlint:ktlint-core:0.49.0=ktlint +com.pinterest.ktlint:ktlint-logger:0.49.0=ktlint +com.pinterest.ktlint:ktlint-reporter-baseline:0.49.0=ktlint +com.pinterest.ktlint:ktlint-reporter-checkstyle:0.49.0=ktlint +com.pinterest.ktlint:ktlint-reporter-format:0.49.0=ktlint +com.pinterest.ktlint:ktlint-reporter-html:0.49.0=ktlint +com.pinterest.ktlint:ktlint-reporter-json:0.49.0=ktlint +com.pinterest.ktlint:ktlint-reporter-plain-summary:0.49.0=ktlint +com.pinterest.ktlint:ktlint-reporter-plain:0.49.0=ktlint +com.pinterest.ktlint:ktlint-reporter-sarif:0.49.0=ktlint +com.pinterest.ktlint:ktlint-rule-engine-core:0.49.0=ktlint +com.pinterest.ktlint:ktlint-rule-engine:0.49.0=ktlint +com.pinterest.ktlint:ktlint-ruleset-standard:0.49.0=ktlint +com.pinterest:ktlint:0.49.0=ktlint +info.picocli:picocli:4.7.1=ktlint +io.github.classgraph:classgraph:4.8.162=compileClasspath,testCompileClasspath,testRuntimeClasspath +io.github.detekt.sarif4k:sarif4k:0.2.0=ktlint +io.github.java-diff-utils:java-diff-utils:4.12=testRuntimeClasspath +io.github.microutils:kotlin-logging-jvm:3.0.5=ktlint +io.kotest:kotest-assertions-api-jvm:5.7.2=compileClasspath,testCompileClasspath,testRuntimeClasspath +io.kotest:kotest-assertions-api:5.7.2=compileClasspath,testCompileClasspath,testRuntimeClasspath +io.kotest:kotest-assertions-core-jvm:5.7.2=compileClasspath,testCompileClasspath,testRuntimeClasspath +io.kotest:kotest-assertions-core:5.7.2=compileClasspath,testCompileClasspath,testRuntimeClasspath +io.kotest:kotest-assertions-shared-jvm:5.7.2=compileClasspath,testCompileClasspath,testRuntimeClasspath +io.kotest:kotest-assertions-shared:5.7.2=compileClasspath,testCompileClasspath,testRuntimeClasspath +io.kotest:kotest-common-jvm:5.7.2=compileClasspath,testCompileClasspath,testRuntimeClasspath +io.kotest:kotest-common:5.7.2=compileClasspath,testCompileClasspath,testRuntimeClasspath +io.kotest:kotest-extensions-jvm:5.7.2=compileClasspath,testCompileClasspath,testRuntimeClasspath +io.kotest:kotest-extensions:5.7.2=compileClasspath,testCompileClasspath,testRuntimeClasspath +io.kotest:kotest-framework-api-jvm:5.7.2=compileClasspath,testCompileClasspath,testRuntimeClasspath +io.kotest:kotest-framework-api:5.7.2=compileClasspath,testCompileClasspath,testRuntimeClasspath +io.kotest:kotest-framework-concurrency-jvm:5.7.2=compileClasspath,testCompileClasspath,testRuntimeClasspath +io.kotest:kotest-framework-concurrency:5.7.2=compileClasspath,testCompileClasspath,testRuntimeClasspath +io.kotest:kotest-framework-discovery-jvm:5.7.2=compileClasspath,testCompileClasspath,testRuntimeClasspath +io.kotest:kotest-framework-discovery:5.7.2=compileClasspath,testCompileClasspath,testRuntimeClasspath +io.kotest:kotest-framework-engine-jvm:5.7.2=compileClasspath,testCompileClasspath,testRuntimeClasspath +io.kotest:kotest-framework-engine:5.7.2=compileClasspath,testCompileClasspath,testRuntimeClasspath +io.kotest:kotest-runner-junit5-jvm:5.7.2=compileClasspath,testCompileClasspath,testRuntimeClasspath +io.kotest:kotest-runner-junit5:5.7.2=compileClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.10.9=testRuntimeClasspath +net.bytebuddy:byte-buddy:1.10.9=testRuntimeClasspath +net.java.dev.jna:jna-platform:5.9.0=testRuntimeClasspath +net.java.dev.jna:jna:5.6.0=ktlint +net.java.dev.jna:jna:5.9.0=testRuntimeClasspath +org.apiguardian:apiguardian-api:1.1.2=compileClasspath,testCompileClasspath +org.ec4j.core:ec4j-core:0.3.0=ktlint +org.jacoco:org.jacoco.agent:0.8.11=jacocoAgent +org.jetbrains.intellij.deps:trove4j:1.0.20200330=kotlinCompilerClasspath,ktlint +org.jetbrains.kotlin:kotlin-compiler-embeddable:1.8.20=ktlint +org.jetbrains.kotlin:kotlin-compiler-embeddable:1.9.22=kotlinCompilerClasspath +org.jetbrains.kotlin:kotlin-daemon-embeddable:1.8.20=ktlint +org.jetbrains.kotlin:kotlin-daemon-embeddable:1.9.22=kotlinCompilerClasspath +org.jetbrains.kotlin:kotlin-reflect:1.6.10=kotlinCompilerClasspath,ktlint +org.jetbrains.kotlin:kotlin-reflect:1.8.10=testRuntimeClasspath +org.jetbrains.kotlin:kotlin-script-runtime:1.8.20=ktlint +org.jetbrains.kotlin:kotlin-script-runtime:1.9.22=kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest +org.jetbrains.kotlin:kotlin-scripting-common:1.9.22=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest +org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.9.22=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest +org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.9.22=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest +org.jetbrains.kotlin:kotlin-scripting-jvm:1.9.22=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest +org.jetbrains.kotlin:kotlin-stdlib-common:1.8.20=ktlint +org.jetbrains.kotlin:kotlin-stdlib-common:1.9.22=compileClasspath,testCompileClasspath,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.20=compileClasspath,ktlint,testCompileClasspath,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.20=compileClasspath,ktlint,testCompileClasspath,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib:1.8.20=ktlint +org.jetbrains.kotlin:kotlin-stdlib:1.9.22=compileClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,testCompileClasspath,testRuntimeClasspath +org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.0=compileClasspath,testCompileClasspath,testRuntimeClasspath +org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.7.0=compileClasspath,testCompileClasspath,testRuntimeClasspath +org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.0=compileClasspath,testCompileClasspath,testRuntimeClasspath +org.jetbrains.kotlinx:kotlinx-coroutines-debug:1.7.0=testRuntimeClasspath +org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:1.7.0=testRuntimeClasspath +org.jetbrains.kotlinx:kotlinx-coroutines-test-jvm:1.7.0=compileClasspath,testCompileClasspath,testRuntimeClasspath +org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.0=compileClasspath,testCompileClasspath,testRuntimeClasspath +org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.4.1=ktlint +org.jetbrains.kotlinx:kotlinx-serialization-core:1.4.1=ktlint +org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:1.4.1=ktlint +org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.1=ktlint +org.jetbrains:annotations:13.0=kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,ktlint +org.jetbrains:annotations:23.0.0=compileClasspath,testCompileClasspath,testRuntimeClasspath +org.junit.jupiter:junit-jupiter-api:5.8.2=compileClasspath,testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-commons:1.8.2=compileClasspath,testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-engine:1.8.2=compileClasspath,testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-launcher:1.8.2=compileClasspath,testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-suite-api:1.8.2=compileClasspath,testCompileClasspath,testRuntimeClasspath +org.junit:junit-bom:5.8.2=compileClasspath,testCompileClasspath,testRuntimeClasspath +org.opentest4j:opentest4j:1.2.0=compileClasspath,testCompileClasspath +org.opentest4j:opentest4j:1.3.0=testRuntimeClasspath +org.slf4j:slf4j-api:2.0.4=ktlint +empty=annotationProcessor,kotlinScriptDefExtensions,testAnnotationProcessor,testKotlinScriptDefExtensions diff --git a/vss-core/gradle.lockfile b/vss-core/gradle.lockfile new file mode 100644 index 0000000..30c0b8c --- /dev/null +++ b/vss-core/gradle.lockfile @@ -0,0 +1,114 @@ +# This is a Gradle generated file for dependency locking. +# Manual edits can break the build and are not advised. +# This file is expected to be part of source control. +ch.qos.logback:logback-classic:1.3.5=ktlint +ch.qos.logback:logback-core:1.3.5=ktlint +com.github.ajalt:colormath:1.2.0=testCompileClasspath,testRuntimeClasspath +com.github.ajalt:mordant:1.2.1=testCompileClasspath,testRuntimeClasspath +com.pinterest.ktlint:ktlint-cli-reporter:0.49.0=ktlint +com.pinterest.ktlint:ktlint-cli-ruleset-core:0.49.0=ktlint +com.pinterest.ktlint:ktlint-core:0.49.0=ktlint +com.pinterest.ktlint:ktlint-logger:0.49.0=ktlint +com.pinterest.ktlint:ktlint-reporter-baseline:0.49.0=ktlint +com.pinterest.ktlint:ktlint-reporter-checkstyle:0.49.0=ktlint +com.pinterest.ktlint:ktlint-reporter-format:0.49.0=ktlint +com.pinterest.ktlint:ktlint-reporter-html:0.49.0=ktlint +com.pinterest.ktlint:ktlint-reporter-json:0.49.0=ktlint +com.pinterest.ktlint:ktlint-reporter-plain-summary:0.49.0=ktlint +com.pinterest.ktlint:ktlint-reporter-plain:0.49.0=ktlint +com.pinterest.ktlint:ktlint-reporter-sarif:0.49.0=ktlint +com.pinterest.ktlint:ktlint-rule-engine-core:0.49.0=ktlint +com.pinterest.ktlint:ktlint-rule-engine:0.49.0=ktlint +com.pinterest.ktlint:ktlint-ruleset-standard:0.49.0=ktlint +com.pinterest:ktlint:0.49.0=ktlint +info.picocli:picocli:4.7.1=ktlint +io.github.classgraph:classgraph:4.8.162=testCompileClasspath,testRuntimeClasspath +io.github.detekt.sarif4k:sarif4k:0.2.0=ktlint +io.github.java-diff-utils:java-diff-utils:4.12=testRuntimeClasspath +io.github.microutils:kotlin-logging-jvm:3.0.5=ktlint +io.kotest:kotest-assertions-api-jvm:5.7.2=testCompileClasspath,testRuntimeClasspath +io.kotest:kotest-assertions-api:5.7.2=testCompileClasspath,testRuntimeClasspath +io.kotest:kotest-assertions-core-jvm:5.7.2=testCompileClasspath,testRuntimeClasspath +io.kotest:kotest-assertions-core:5.7.2=testCompileClasspath,testRuntimeClasspath +io.kotest:kotest-assertions-shared-jvm:5.7.2=testCompileClasspath,testRuntimeClasspath +io.kotest:kotest-assertions-shared:5.7.2=testCompileClasspath,testRuntimeClasspath +io.kotest:kotest-common-jvm:5.7.2=testCompileClasspath,testRuntimeClasspath +io.kotest:kotest-common:5.7.2=testCompileClasspath,testRuntimeClasspath +io.kotest:kotest-extensions-jvm:5.7.2=testCompileClasspath,testRuntimeClasspath +io.kotest:kotest-extensions:5.7.2=testCompileClasspath,testRuntimeClasspath +io.kotest:kotest-framework-api-jvm:5.7.2=testCompileClasspath,testRuntimeClasspath +io.kotest:kotest-framework-api:5.7.2=testCompileClasspath,testRuntimeClasspath +io.kotest:kotest-framework-concurrency-jvm:5.7.2=testCompileClasspath,testRuntimeClasspath +io.kotest:kotest-framework-concurrency:5.7.2=testCompileClasspath,testRuntimeClasspath +io.kotest:kotest-framework-discovery-jvm:5.7.2=testCompileClasspath,testRuntimeClasspath +io.kotest:kotest-framework-discovery:5.7.2=testCompileClasspath,testRuntimeClasspath +io.kotest:kotest-framework-engine-jvm:5.7.2=testCompileClasspath,testRuntimeClasspath +io.kotest:kotest-framework-engine:5.7.2=testCompileClasspath,testRuntimeClasspath +io.kotest:kotest-runner-junit5-jvm:5.7.2=testCompileClasspath,testRuntimeClasspath +io.kotest:kotest-runner-junit5:5.7.2=testCompileClasspath,testRuntimeClasspath +io.mockk:mockk-agent-api-jvm:1.13.7=testCompileClasspath,testRuntimeClasspath +io.mockk:mockk-agent-api:1.13.7=testCompileClasspath,testRuntimeClasspath +io.mockk:mockk-agent-jvm:1.13.7=testCompileClasspath,testRuntimeClasspath +io.mockk:mockk-agent:1.13.7=testCompileClasspath,testRuntimeClasspath +io.mockk:mockk-core-jvm:1.13.7=testCompileClasspath,testRuntimeClasspath +io.mockk:mockk-core:1.13.7=testCompileClasspath,testRuntimeClasspath +io.mockk:mockk-dsl-jvm:1.13.7=testCompileClasspath,testRuntimeClasspath +io.mockk:mockk-dsl:1.13.7=testCompileClasspath,testRuntimeClasspath +io.mockk:mockk-jvm:1.13.7=testCompileClasspath,testRuntimeClasspath +io.mockk:mockk:1.13.7=testCompileClasspath,testRuntimeClasspath +junit:junit:4.13.2=testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.12.20=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.12.20=testCompileClasspath,testRuntimeClasspath +net.java.dev.jna:jna-platform:5.9.0=testRuntimeClasspath +net.java.dev.jna:jna:5.6.0=ktlint +net.java.dev.jna:jna:5.9.0=testRuntimeClasspath +org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath +org.ec4j.core:ec4j-core:0.3.0=ktlint +org.hamcrest:hamcrest-core:1.3=testRuntimeClasspath +org.jacoco:org.jacoco.agent:0.8.11=jacocoAgent +org.jetbrains.intellij.deps:trove4j:1.0.20200330=kotlinCompilerClasspath,ktlint +org.jetbrains.kotlin:kotlin-compiler-embeddable:1.8.20=ktlint +org.jetbrains.kotlin:kotlin-compiler-embeddable:1.9.22=kotlinCompilerClasspath +org.jetbrains.kotlin:kotlin-daemon-embeddable:1.8.20=ktlint +org.jetbrains.kotlin:kotlin-daemon-embeddable:1.9.22=kotlinCompilerClasspath +org.jetbrains.kotlin:kotlin-reflect:1.6.10=kotlinCompilerClasspath,ktlint +org.jetbrains.kotlin:kotlin-reflect:1.9.22=compileClasspath,testCompileClasspath,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-script-runtime:1.8.20=ktlint +org.jetbrains.kotlin:kotlin-script-runtime:1.9.22=kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest +org.jetbrains.kotlin:kotlin-scripting-common:1.9.22=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest +org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.9.22=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest +org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.9.22=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest +org.jetbrains.kotlin:kotlin-scripting-jvm:1.9.22=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest +org.jetbrains.kotlin:kotlin-stdlib-common:1.8.20=ktlint +org.jetbrains.kotlin:kotlin-stdlib-common:1.9.22=testCompileClasspath,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.20=ktlint,testCompileClasspath,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.20=ktlint,testCompileClasspath,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib:1.8.20=ktlint +org.jetbrains.kotlin:kotlin-stdlib:1.9.22=compileClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,testCompileClasspath,testRuntimeClasspath +org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.0=testCompileClasspath,testRuntimeClasspath +org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.7.0=testCompileClasspath,testRuntimeClasspath +org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.0=testCompileClasspath,testRuntimeClasspath +org.jetbrains.kotlinx:kotlinx-coroutines-debug:1.7.0=testRuntimeClasspath +org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:1.7.0=testRuntimeClasspath +org.jetbrains.kotlinx:kotlinx-coroutines-test-jvm:1.7.0=testCompileClasspath,testRuntimeClasspath +org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.0=testCompileClasspath,testRuntimeClasspath +org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.4.1=ktlint +org.jetbrains.kotlinx:kotlinx-serialization-core:1.4.1=ktlint +org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:1.4.1=ktlint +org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.1=ktlint +org.jetbrains:annotations:13.0=compileClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,ktlint +org.jetbrains:annotations:23.0.0=testCompileClasspath,testRuntimeClasspath +org.junit.jupiter:junit-jupiter-api:5.8.2=testCompileClasspath,testRuntimeClasspath +org.junit.jupiter:junit-jupiter-engine:5.8.2=testRuntimeClasspath +org.junit.jupiter:junit-jupiter-params:5.8.2=testRuntimeClasspath +org.junit.jupiter:junit-jupiter:5.8.2=testRuntimeClasspath +org.junit.platform:junit-platform-commons:1.8.2=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-engine:1.8.2=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-launcher:1.8.2=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-suite-api:1.8.2=testCompileClasspath,testRuntimeClasspath +org.junit:junit-bom:5.8.2=testCompileClasspath,testRuntimeClasspath +org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath +org.opentest4j:opentest4j:1.2.0=testCompileClasspath +org.opentest4j:opentest4j:1.3.0=testRuntimeClasspath +org.slf4j:slf4j-api:2.0.4=ktlint +empty=annotationProcessor,kotlinScriptDefExtensions,testAnnotationProcessor,testKotlinScriptDefExtensions diff --git a/vss-core/src/main/kotlin/org/eclipse/kuksa/vsscore/annotation/VssModelGenerator.kt b/vss-core/src/main/kotlin/org/eclipse/kuksa/vsscore/annotation/VssModelGenerator.kt deleted file mode 100644 index 8cf8928..0000000 --- a/vss-core/src/main/kotlin/org/eclipse/kuksa/vsscore/annotation/VssModelGenerator.kt +++ /dev/null @@ -1,59 +0,0 @@ -/* - * Copyright (c) 2023 Contributors to the Eclipse Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * SPDX-License-Identifier: Apache-2.0 - * - */ - -package org.eclipse.kuksa.vsscore.annotation - -/** - * Add this annotation to any class to trigger the model generation (Kotlin Symbol Processing) for the given - * Vehicle Signal Specification definition file by the "vss-processor-plugin". Currently VSS files in - * .yaml and .json format are supported by the vss-processor. - * Use the "VSS Processor Plugin" to provide the Symbol Processor with the necessary VSS file(s). - * - * ### Plugin Example - * - * ``` - * // app/build.gradle.kts - * plugins { - * id("org.eclipse.kuksa.vss-processor-plugin") version "" - * } - * - * // Optional - See plugin documentation. Files inside the "$rootDir/vss" folder are used automatically. - * vssProcessor { - * searchPath = "$rootDir/vss" - * } - * ``` - * - * ### Annotation Example - * - * ``` - * @VssModelGenerator - * class Activity - * ``` - * - * ### Important - * - * When using the KSP (Kotlin Symbol Processing) feature with this annotation in combination with android compose - * then the incremental compiler for KSP needs to be disabled explicitly in the gradle properties. - * ``` - * - * ``` - */ -@Target(AnnotationTarget.CLASS) -@Retention(AnnotationRetention.SOURCE) -annotation class VssModelGenerator