diff --git a/.github/workflows/gradle-publish.yml b/.github/workflows/gradle-publish.yml index 7d68c78..b1717c6 100644 --- a/.github/workflows/gradle-publish.yml +++ b/.github/workflows/gradle-publish.yml @@ -19,10 +19,10 @@ jobs: steps: - uses: actions/checkout@v3 - - name: Set up JDK 11 + - name: Set up JDK 17 uses: actions/setup-java@v3 with: - java-version: '11' + java-version: '17' distribution: 'temurin' server-id: github # Value of the distributionManagement/repository/id field of the pom.xml settings-path: ${{ github.workspace }} # location for the settings.xml file diff --git a/CHANGELOG.md b/CHANGELOG.md index 250e195..ffd7fdf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Dual-Version Kotlin 1.9.10 / 2.0.0 +## 20240725 + +* Don't depend on SNAPSHOT serialization by default. If you need COSE features that were previously pulled in form the snapshot, simply add `serialization = 1.8.0-SNAPSHOT` (or: even safer: `serialization = 1.8.0-SNAPSHOT!!`) to your project' `gradle/libs.verions.toml`. This changes comes with a huge advantage: It does not add this snapshot dependency virally to all projects that rely on this conventions plugin. + ## 20240717 * XCFramework: Disable bitcode embedding by default * Dependency Updates: diff --git a/README.md b/README.md index d38caa8..9134517 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # A-SIT Plus Gradle Conventions Plugin -[![Version](https://img.shields.io/badge/Kotlin_1.9.10-+20240717-gray.svg?style=flat&logo=kotlin&labelColor=blue&logoColor=white)](CHANGELOG.md) -[![Version](https://img.shields.io/badge/Kotlin_2.0.0-+20240717-gray.svg?style=flat&logo=kotlin&labelColor=7463ce&logoColor=white)](CHANGELOG.md) +[![Version](https://img.shields.io/badge/Kotlin_1.9.10-+20240725-gray.svg?style=flat&logo=kotlin&labelColor=blue&logoColor=white)](CHANGELOG.md) +[![Version](https://img.shields.io/badge/Kotlin_2.0.0-+20240725-gray.svg?style=flat&logo=kotlin&labelColor=7463ce&logoColor=white)](CHANGELOG.md) [![GitHub license](https://img.shields.io/badge/license-Apache%20License%202.0-brightgreen.svg?style=flat&)](http://www.apache.org/licenses/LICENSE-2.0) **Note: This plugin is still in its early stages and may not work well for edge cases! @@ -209,7 +209,7 @@ In addition, shorthand for dependencies and other extensions are available to st ### JDK Version Management -`jvmToolchain(11)`, `jvmTarget = 11`, and `jdkName = 11` are applied by default, **unless** +`jvmToolchain(17)`, `jvmTarget = 17`, and `jdkName = 17` are applied by default, **unless** the [multi-release jar plugin ("me.champeau.mrjar")](https://melix.github.io/mrjar-gradle-plugin/0.1/index.html) is applied as well. Note that no version management is in place for the multi-release jar plugin, as we rarely need it internally. diff --git a/gradle.properties b/gradle.properties index ab4e07a..6ff69e0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,2 +1,2 @@ -buildDate=20240717 +buildDate=20240725 groupId=at.asitplus.gradle diff --git a/legacy/src/main/kotlin/at/asitplus/gradle/AspVersions.kt b/legacy/src/main/kotlin/at/asitplus/gradle/AspVersions.kt index 196faf4..ebe2021 100644 --- a/legacy/src/main/kotlin/at/asitplus/gradle/AspVersions.kt +++ b/legacy/src/main/kotlin/at/asitplus/gradle/AspVersions.kt @@ -55,7 +55,7 @@ class AspVersions(private val project: Project) { val kmmresult = versionOf("kmmresult") inner class Jvm { - val defaultTarget = 11.toString() + val defaultTarget = 17.toString() val bouncycastle get() = versionOf("bouncycastle") } diff --git a/legacy/src/main/resources/versions.properties b/legacy/src/main/resources/versions.properties index e1986c7..ebe0c34 100644 --- a/legacy/src/main/resources/versions.properties +++ b/legacy/src/main/resources/versions.properties @@ -4,8 +4,7 @@ ktor=2.3.12 ksp=1.0.13 nexus=1.3.0 dokka=1.9.20 -jvmTarget=17 -serialization=1.6.3-SNAPSHOT!! +serialization=1.7.1 datetime=0.6.0 coroutines=1.8.1 napier=2.7.1