From af275f5a2fa91602405e779aa3a204996e5d60c4 Mon Sep 17 00:00:00 2001 From: Gareth Coles Date: Tue, 21 May 2024 15:28:32 +0100 Subject: [PATCH] K2 branch and release --- .github/workflows/publish-k2.yml | 108 +++++++++++++++++++++++++++++++ gradle.properties | 2 +- gradle/libs.versions.toml | 4 +- 3 files changed, 111 insertions(+), 3 deletions(-) create mode 100644 .github/workflows/publish-k2.yml diff --git a/.github/workflows/publish-k2.yml b/.github/workflows/publish-k2.yml new file mode 100644 index 0000000000..2c59156646 --- /dev/null +++ b/.github/workflows/publish-k2.yml @@ -0,0 +1,108 @@ +name: Publish (K2) + +on: + push: + branches: + - "k2" + +permissions: + contents: write + id-token: write + +jobs: + publish: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v4 + + - name: Set up Java + uses: actions/setup-java@v4 + + with: + java-version: 17 + distribution: temurin + + - name: Set up Kotlin + uses: fwilhe2/setup-kotlin@main + + - name: Get version + id: project-version + + run: | + VERSION=$(kotlin .github/get-version.main.kts) + + echo "Project version: $VERSION" + echo "version=$VERSION" >> $GITHUB_OUTPUT + + - name: Set up Gradle properties + + run: | + mkdir -p ~/.gradle + echo "githubToken=${{ secrets.GITHUB_TOKEN }}" >> ~/.gradle/gradle.properties + echo -e "\norg.gradle.jvmargs=-XX:MaxMetaspaceSize=5G" >> ~/.gradle/gradle.properties + + - name: Gradle (Build) + uses: gradle/gradle-build-action@v3 + + with: + arguments: checkLicenses build dokkaHtmlMultiModule + dependency-graph: generate-and-submit + + env: + TOKEN: ${{ secrets.TOKEN }} + + - name: Zip Dokka docs + working-directory: build/dokka/ + + run: zip -qq -r dokka.zip htmlMultiModule + + - name: Disable parallel publish + if: contains(steps.project-version.outputs.version, '-SNAPSHOT') + + run: kotlin .github/disable-parallel.main.kts + + - name: Gradle (Publish) + uses: gradle/gradle-build-action@v3 + + if: contains(steps.project-version.outputs.version, '-SNAPSHOT') + + env: + ORG_GRADLE_PROJECT_signingKey: "${{ secrets.GPG_KEY }}" + ORG_GRADLE_PROJECT_signingPassword: "${{ secrets.GPG_PASSWORD }}" + + OSSRH_USERNAME: "${{ secrets.OSSRH_USERNAME }}" + OSSRH_PASSWORD: "${{ secrets.OSSRH_PASSWORD }}" + + TOKEN: "${{ secrets.TOKEN }}" + + with: + arguments: publish --no-parallel + + - name: Upload artifact (Extra Module JARs) + uses: actions/upload-artifact@v4 + + with: + name: JARs (Extra Modules) + path: extra-modules/*/build/libs/*.jar + + - name: Upload artifact (Main JARs) + uses: actions/upload-artifact@v4 + + with: + name: JARs (Main) + path: kord-extensions/build/libs/*.jar + + - name: Upload artifact (Module JARs) + uses: actions/upload-artifact@v4 + + with: + name: JARs (Modules) + path: modules/*/build/libs/*.jar + + - name: Upload artifact (Dokka) + uses: actions/upload-artifact@v4 + + with: + name: Dokka HTML + path: build/dokka/dokka.zip diff --git a/gradle.properties b/gradle.properties index 4bc07a6a22..6ceb08b7c8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ org.gradle.parallel=true kotlin.incremental=true ksp.incremental=false -projectVersion=1.8.0-SNAPSHOT +projectVersion=1.8.0-k2-SNAPSHOT #dokka will run out of memory with the default meta space org.gradle.jvmargs=-XX:MaxMetaspaceSize=1024m diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 4718fb5ccb..0eb88d2e8c 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,7 +1,7 @@ [versions] detekt = "1.23.6" # Note: Plugin versions must be updated in buildSrc/build.gradle.kts dokka = "1.9.20" # Note: Plugin versions must be updated in buildSrc/build.gradle.kts -kotlin = "1.9.24" # Note: Plugin versions must be updated in buildSrc/build.gradle.kts +kotlin = "2.0.0" # Note: Plugin versions must be updated in buildSrc/build.gradle.kts commons-validator = "1.8.0" groovy = "3.0.21" @@ -14,7 +14,7 @@ kaml = "0.59.0" koin = "3.5.6" kord = "0.14.0-SNAPSHOT" #kord = "0.12.0" -ksp = "1.9.24-1.0.20" +ksp = "2.0.0-RC3-1.0.20" ktor = "2.3.11" kx-coro = "1.8.1" kx-ser = "1.6.3"