From 0383f0b7c168f2585e6669ca9c8b60dc37e6d157 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bernd=20Pr=C3=BCnster?= <bernd.pruenster@a-sit.at>
Date: Thu, 28 Sep 2023 11:17:40 +0200
Subject: [PATCH] Do not strictly enforce JDK11 (through conventions) (#22)
do not **strictly** enforce jdk 11 anymore
---
.github/workflows/build-ios.yml | 2 +-
.github/workflows/publish-dry-run.yml | 2 +-
.github/workflows/publish.yml | 2 +-
conventions-vclib/build.gradle.kts | 18 +++---------------
conventions-vclib/gradle-conventions-plugin | 2 +-
.../wallet/lib/data/CredentialSubjectTest.kt | 1 -
6 files changed, 7 insertions(+), 20 deletions(-)
diff --git a/.github/workflows/build-ios.yml b/.github/workflows/build-ios.yml
index a2e7d602..051957b5 100644
--- a/.github/workflows/build-ios.yml
+++ b/.github/workflows/build-ios.yml
@@ -11,7 +11,7 @@ jobs:
- uses: actions/setup-java@v3
with:
distribution: 'temurin'
- java-version: '11'
+ java-version: '17'
- name: Build klibs
run: ./gradlew iosArm64MainKlibrary iosX64MainKlibrary
- name: Build XCFrameworks
diff --git a/.github/workflows/publish-dry-run.yml b/.github/workflows/publish-dry-run.yml
index f242804c..4010d670 100644
--- a/.github/workflows/publish-dry-run.yml
+++ b/.github/workflows/publish-dry-run.yml
@@ -15,7 +15,7 @@ jobs:
- uses: actions/setup-java@v3
with:
distribution: 'temurin'
- java-version: '11'
+ java-version: '17'
- name: Publish to Maven Local
run: ./gradlew clean publishToMavenLocal
env:
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 3b4b262c..107446cb 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -15,7 +15,7 @@ jobs:
- uses: actions/setup-java@v3
with:
distribution: 'temurin'
- java-version: '11'
+ java-version: '17'
- name: Publish to Sonatype
run: ./gradlew clean publishToSonatype closeSonatypeStagingRepository
env:
diff --git a/conventions-vclib/build.gradle.kts b/conventions-vclib/build.gradle.kts
index 7c9fe6f4..28e9997a 100644
--- a/conventions-vclib/build.gradle.kts
+++ b/conventions-vclib/build.gradle.kts
@@ -1,15 +1,12 @@
+import java.io.FileInputStream
+import java.util.*
+
plugins {
`kotlin-dsl`
idea
}
group = "at.asitplus.gradle"
-idea {
- project {
- jdkName = "11" //TODO use from ASP conventions plugin?
- }
-}
-
dependencies {
api("at.asitplus.gradle:conventions")
}
@@ -19,15 +16,6 @@ repositories {
mavenCentral()
gradlePluginPortal()
}
-kotlin {
- jvmToolchain {
- (this as JavaToolchainSpec).languageVersion.set(JavaLanguageVersion.of(11/*TODO share*/))
- }
- /*compilerOptions {
- languageVersion.set(org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_1_9)
- apiVersion.set(org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_1_9)
- }*/
-}
gradlePlugin {
plugins.register("vclib-conventions") {
diff --git a/conventions-vclib/gradle-conventions-plugin b/conventions-vclib/gradle-conventions-plugin
index 547265c8..970ed053 160000
--- a/conventions-vclib/gradle-conventions-plugin
+++ b/conventions-vclib/gradle-conventions-plugin
@@ -1 +1 @@
-Subproject commit 547265c8d424c42109677da6de274e656c3ebb54
+Subproject commit 970ed0536535b44641dd0417e566d76dfa3387b0
diff --git a/vclib/src/commonTest/kotlin/at/asitplus/wallet/lib/data/CredentialSubjectTest.kt b/vclib/src/commonTest/kotlin/at/asitplus/wallet/lib/data/CredentialSubjectTest.kt
index bf25e275..92a58132 100644
--- a/vclib/src/commonTest/kotlin/at/asitplus/wallet/lib/data/CredentialSubjectTest.kt
+++ b/vclib/src/commonTest/kotlin/at/asitplus/wallet/lib/data/CredentialSubjectTest.kt
@@ -4,7 +4,6 @@ import io.kotest.core.spec.style.FreeSpec
import io.kotest.matchers.shouldBe
import kotlinx.serialization.SerialName
import kotlinx.serialization.Serializable
-import kotlinx.serialization.encodeToString
import kotlinx.serialization.json.Json
class CredentialSubjectTest : FreeSpec({
--
GitLab