Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Do not strictly enforce JDK11 (through conventions) #22

Merged
merged 3 commits into from
Sep 28, 2023
Merged

Do not strictly enforce JDK11 (through conventions) #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7a8072b
do not **strictly** enforce jdk 11 anymore
JesusMcCloud Sep 18, 2023
175ee1f
minor fixes
JesusMcCloud Sep 27, 2023
d63bdb8
revert unneccessary changes
JesusMcCloud Sep 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build-ios.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-dry-run.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
18 changes: 3 additions & 15 deletions conventions-vclib/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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")
}
Expand All @@ -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") {
Expand Down
2 changes: 1 addition & 1 deletion conventions-vclib/gradle-conventions-plugin
Open in desktop
Submodule gradle-conventions-plugin updated 5 files
+3 −0 CHANGELOG.md
+12 −8 README.md
+1 −18 build.gradle.kts
+1 −1 src/main/kotlin/AspVersions.kt
+38 −12 src/main/kotlin/at/asitplus/gradle/Plugin.kt
1 change: 0 additions & 1 deletion vclib/src/commonTest/kotlin/at/asitplus/wallet/lib/data/CredentialSubjectTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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({
Expand Down