diff --git a/.github/workflows/gradle-ci.yml b/.github/workflows/gradle-ci.yml index 076e2f3..9149d43 100755 --- a/.github/workflows/gradle-ci.yml +++ b/.github/workflows/gradle-ci.yml @@ -14,16 +14,13 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Set up JDK 17 + - name: Set up JDK uses: actions/setup-java@v2 with: - distribution: adopt + distribution: temurin java-version: 17 cache: gradle - - name: Grant execute permission for gradlew - run: chmod +x gradlew - - name: Build run: gradle build diff --git a/.github/workflows/publish-packages.yml b/.github/workflows/publish-packages.yml index 47257b0..3b86bca 100755 --- a/.github/workflows/publish-packages.yml +++ b/.github/workflows/publish-packages.yml @@ -14,16 +14,13 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Set up JDK 17 + - name: Set up JDK uses: actions/setup-java@v2 with: - distribution: adopt + distribution: temurin java-version: 17 cache: gradle - - name: Grant execute permission for gradlew - run: chmod +x gradlew - - name: Run gradle build and publish run: gradle build publish -PmineinabyssMavenUsername=${{ secrets.MAVEN_PUBLISH_USERNAME }} -PmineinabyssMavenPassword=${{ secrets.MAVEN_PUBLISH_PASSWORD }} @@ -41,7 +38,7 @@ jobs: shell: bash id: extract_version run: | - version=`./gradlew properties --no-daemon --console=plain -q | grep "^version:" | awk '{printf $2}'` + version=`gradle properties --console=plain -q | grep "^version:" | awk '{printf $2}'` echo "::set-output name=version::$version" - name: Create GitHub Release @@ -51,4 +48,4 @@ jobs: prerelease: false automatic_release_tag: v${{ steps.extract_version.outputs.version }} files: | - build/libs/*-all.jar + build/libs/*[0-9].jar diff --git a/guiy-example/build.gradle.kts b/guiy-example/build.gradle.kts index 2439a11..c83e3f5 100644 --- a/guiy-example/build.gradle.kts +++ b/guiy-example/build.gradle.kts @@ -1,6 +1,3 @@ -import Com_mineinabyss_conventions_platform_gradle.Deps -import org.jetbrains.kotlin.gradle.tasks.KotlinCompile - val idofrontVersion: String by project plugins {