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

Bump gradle to 8.0.2 & Java to 11 #1299

Merged
merged 23 commits into from
Mar 13, 2023
Merged

Bump gradle to 8.0.2 & Java to 11 #1299

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
23a3548
Bump gradle to 8.0.0-rc3
soywiz Feb 9, 2023
13fe40f
Small fixes
soywiz Feb 9, 2023
ec3e4ca
Update gradle to 8.0.1
soywiz Feb 21, 2023
ab72220
Add --stacktrace
soywiz Feb 21, 2023
4e6d5f9
Update e2e-test too
soywiz Feb 21, 2023
9be57e0
./gradlew --stacktrace
soywiz Feb 21, 2023
616d9c3
Force at least Java11
soywiz Feb 21, 2023
5099ce8
Some version adjustments
soywiz Feb 21, 2023
18176d9
Try to fix android
soywiz Feb 21, 2023
856919a
Try to fix signing issue
soywiz Feb 21, 2023
fcb065b
Prevent warning
soywiz Feb 21, 2023
08f207a
Try to fix publication
soywiz Feb 21, 2023
a5c7a63
Fix e2e gradle
soywiz Feb 21, 2023
8089bb5
Try to fix android
soywiz Feb 21, 2023
6f3a9d7
Try ti remove unnecessary AndroidManifest.xml
soywiz Feb 21, 2023
3e6c4f0
Merge branch 'main' into bump/bump.gradle.to.8.0.0-rc-3
soywiz Feb 27, 2023
56a6aa2
Merge branch 'main' into bump/bump.gradle.to.8.0.0-rc-3
soywiz Mar 13, 2023
526976f
Gradle 8.0.2
soywiz Mar 13, 2023
a98ab76
Try to select java version from an environment in the workflow file
soywiz Mar 13, 2023
be0d350
Try to select java version from an environment in the workflow file
soywiz Mar 13, 2023
46d75c0
Try to select java version from an environment in the workflow file
soywiz Mar 13, 2023
511d85b
Try to select java version from an environment in the workflow file
soywiz Mar 13, 2023
55d5a17
Try to redirect e2e-test gradlew to the parent one to match versions
soywiz Mar 13, 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
51 changes: 11 additions & 40 deletions .github/workflows/DEPLOY.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ env:
ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.ORG_GRADLE_PROJECT_SIGNINGPASSWORD }}
SONATYPE_USERNAME: ${{ secrets.SONATYPEUSERNAME }}
SONATYPE_PASSWORD: ${{ secrets.SONATYPEPASSWORD }}
JAVA_VERSION: 11

jobs:
create-staging-repo:
Expand All @@ -20,10 +21,7 @@ jobs:
stagedRepositoryId: ${{ steps.createStagedRepositoryId.outputs.stagedRepositoryId }}
steps:
- uses: actions/checkout@v1
- name: Set up JDK 1.8
uses: actions/setup-java@v1
with:
java-version: 1.8
- { name: Set up JDK, uses: actions/setup-java@v1, with: { java-version: "${{ env.JAVA_VERSION }}" } }
- run: sudo apt-get install xvfb
- id: createStagedRepositoryId
run: xvfb-run --auto-servernum ./gradlew --no-daemon startReleasingMavenCentral
Expand All @@ -35,10 +33,7 @@ jobs:
stagedRepositoryId: ${{needs.create-staging-repo.outputs.stagedRepositoryId}}
steps:
- uses: actions/checkout@v1
- name: Set up JDK 1.8
uses: actions/setup-java@v1
with:
java-version: 1.8
- { name: Set up JDK, uses: actions/setup-java@v1, with: { java-version: "${{ env.JAVA_VERSION }}" } }
- run: CALL gradlew.bat --no-daemon checkReleasingMavenCentral publishMingwX64PublicationToMavenRepository
shell: cmd
env:
Expand All @@ -51,10 +46,7 @@ jobs:
stagedRepositoryId: ${{needs.create-staging-repo.outputs.stagedRepositoryId}}
steps:
- uses: actions/checkout@v1
- name: Set up JDK 1.8
uses: actions/setup-java@v1
with:
java-version: 1.8
- { name: Set up JDK, uses: actions/setup-java@v1, with: { java-version: "${{ env.JAVA_VERSION }}" } }
- run: ./gradlew checkReleasingMavenCentral
- run: ./gradlew publishMacosX64PublicationToMavenRepository publishMacosArm64PublicationToMavenRepository
env:
Expand All @@ -66,10 +58,7 @@ jobs:
stagedRepositoryId: ${{needs.create-staging-repo.outputs.stagedRepositoryId}}
steps:
- uses: actions/checkout@v1
- name: Set up JDK 1.8
uses: actions/setup-java@v1
with:
java-version: 1.8
- { name: Set up JDK, uses: actions/setup-java@v1, with: { java-version: "${{ env.JAVA_VERSION }}" } }
- run: ./gradlew checkReleasingMavenCentral
- run: ./gradlew publishIosArm64PublicationToMavenRepository publishIosX64PublicationToMavenRepository publishIosSimulatorArm64PublicationToMavenRepository
env:
Expand All @@ -81,10 +70,7 @@ jobs:
stagedRepositoryId: ${{needs.create-staging-repo.outputs.stagedRepositoryId}}
steps:
- uses: actions/checkout@v1
- name: Set up JDK 1.8
uses: actions/setup-java@v1
with:
java-version: 1.8
- { name: Set up JDK, uses: actions/setup-java@v1, with: { java-version: "${{ env.JAVA_VERSION }}" } }
- run: ./gradlew checkReleasingMavenCentral
- run: ./gradlew publishTvosX64PublicationToMavenRepository publishTvosArm64PublicationToMavenRepository publishTvosSimulatorArm64PublicationToMavenRepository
env:
Expand All @@ -96,10 +82,7 @@ jobs:
stagedRepositoryId: ${{needs.create-staging-repo.outputs.stagedRepositoryId}}
steps:
- uses: actions/checkout@v1
- name: Set up JDK 1.8
uses: actions/setup-java@v1
with:
java-version: 1.8
- { name: Set up JDK, uses: actions/setup-java@v1, with: { java-version: "${{ env.JAVA_VERSION }}" } }
- run: ./gradlew checkReleasingMavenCentral
- run: ./gradlew publishWatchosX64PublicationToMavenRepository publishWatchosArm64PublicationToMavenRepository publishWatchosSimulatorArm64PublicationToMavenRepository
env:
Expand All @@ -111,10 +94,7 @@ jobs:
stagedRepositoryId: ${{needs.create-staging-repo.outputs.stagedRepositoryId}}
steps:
- uses: actions/checkout@v1
- name: Set up JDK 1.8
uses: actions/setup-java@v1
with:
java-version: 1.8
- { name: Set up JDK, uses: actions/setup-java@v1, with: { java-version: "${{ env.JAVA_VERSION }}" } }
- run: sudo apt-get install xvfb
- run: xvfb-run --auto-servernum ./gradlew --no-daemon checkReleasingMavenCentral
- run: xvfb-run --auto-servernum ./gradlew --no-daemon publishKotlinMultiplatformPublicationToMavenRepository publishJvmPublicationToMavenRepository
Expand All @@ -125,10 +105,7 @@ jobs:
stagedRepositoryId: ${{needs.create-staging-repo.outputs.stagedRepositoryId}}
steps:
- uses: actions/checkout@v1
- name: Set up JDK 1.8
uses: actions/setup-java@v1
with:
java-version: 1.8
- { name: Set up JDK, uses: actions/setup-java@v1, with: { java-version: "${{ env.JAVA_VERSION }}" } }
- run: sudo apt-get install xvfb
- run: xvfb-run --auto-servernum ./gradlew --no-daemon checkReleasingMavenCentral
- run: xvfb-run --auto-servernum ./gradlew --no-daemon publishJsPublicationToMavenRepository publishAndroidPublicationToMavenRepository
Expand All @@ -139,10 +116,7 @@ jobs:
stagedRepositoryId: ${{needs.create-staging-repo.outputs.stagedRepositoryId}}
steps:
- uses: actions/checkout@v1
- name: Set up JDK 1.8
uses: actions/setup-java@v1
with:
java-version: 1.8
- { name: Set up JDK, uses: actions/setup-java@v1, with: { java-version: "${{ env.JAVA_VERSION }}" } }
- run: sudo apt-get install xvfb
- run: xvfb-run --auto-servernum ./gradlew --no-daemon checkReleasingMavenCentral
- run: xvfb-run --auto-servernum ./gradlew --no-daemon publishLinuxX64PublicationToMavenRepository publishLinuxArm64PublicationToMavenRepository
Expand All @@ -154,8 +128,5 @@ jobs:
stagedRepositoryId: ${{needs.create-staging-repo.outputs.stagedRepositoryId}}
steps:
- uses: actions/checkout@v1
- name: Set up JDK 1.8
uses: actions/setup-java@v1
with:
java-version: 1.8
- { name: Set up JDK, uses: actions/setup-java@v1, with: { java-version: "${{ env.JAVA_VERSION }}" } }
- run: ./gradlew releaseMavenCentral
1 change: 1 addition & 0 deletions .github/workflows/DEPLOY.yml.disabled
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ on:

env:
FORCED_VERSION: ${{ github.ref }}
JAVA_VERSION: 11

jobs:
publish-windows:
Expand Down
31 changes: 7 additions & 24 deletions .github/workflows/FAKE_TESTDEPLOY.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,14 @@ env:
ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.ORG_GRADLE_PROJECT_SIGNINGPASSWORD }}
SONATYPE_USERNAME: ${{ secrets.SONATYPEUSERNAME }}
SONATYPE_PASSWORD: ${{ secrets.SONATYPEPASSWORD }}
JAVA_VERSION: 11

jobs:
publish-windows:
runs-on: windows-latest
steps:
- uses: actions/checkout@v1
- name: Set up JDK 1.8
uses: actions/setup-java@v1
with:
java-version: 1.8
- { name: Set up JDK, uses: actions/setup-java@v1, with: { java-version: "${{ env.JAVA_VERSION }}" } }
- run: CALL gradlew.bat --no-daemon -DCI=true
shell: cmd
- run: CALL gradlew.bat --no-daemon jvmTest publishMingwX64PublicationToMavenLocal -DCI=true
Expand All @@ -31,10 +29,7 @@ jobs:
runs-on: macos-11
steps:
- uses: actions/checkout@v1
- name: Set up JDK 1.8
uses: actions/setup-java@v1
with:
java-version: 1.8
- { name: Set up JDK, uses: actions/setup-java@v1, with: { java-version: "${{ env.JAVA_VERSION }}" } }
- run: ./gradlew -DCI=true
- run: ./gradlew jvmTest publishMacosX64PublicationToMavenLocal publishMacosArm64PublicationToMavenLocal -DCI=true
env:
Expand All @@ -43,10 +38,7 @@ jobs:
runs-on: macos-11
steps:
- uses: actions/checkout@v1
- name: Set up JDK 1.8
uses: actions/setup-java@v1
with:
java-version: 1.8
- { name: Set up JDK, uses: actions/setup-java@v1, with: { java-version: "${{ env.JAVA_VERSION }}" } }
- run: ./gradlew -DCI=true
- run: ./gradlew publishIosArm64PublicationToMavenLocal publishIosX64PublicationToMavenLocal publishIosSimulatorArm64PublicationToMavenLocal -DCI=true
env:
Expand All @@ -55,32 +47,23 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- name: Set up JDK 1.8
uses: actions/setup-java@v1
with:
java-version: 1.8
- { name: Set up JDK, uses: actions/setup-java@v1, with: { java-version: "${{ env.JAVA_VERSION }}" } }
- run: sudo apt-get install xvfb
- run: xvfb-run --auto-servernum ./gradlew --no-daemon -DCI=true
- run: xvfb-run --auto-servernum ./gradlew --no-daemon publishKotlinMultiplatformPublicationToMavenLocal publishJvmPublicationToMavenLocal -DCI=true
publish-js-android:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- name: Set up JDK 1.8
uses: actions/setup-java@v1
with:
java-version: 1.8
- { name: Set up JDK, uses: actions/setup-java@v1, with: { java-version: "${{ env.JAVA_VERSION }}" } }
- run: sudo apt-get install xvfb
- run: xvfb-run --auto-servernum ./gradlew --no-daemon -DCI=true
- run: xvfb-run --auto-servernum ./gradlew --no-daemon publishJsPublicationToMavenLocal publishAndroidPublicationToMavenLocal -DCI=true
publish-linux:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- name: Set up JDK 1.8
uses: actions/setup-java@v1
with:
java-version: 1.8
- { name: Set up JDK, uses: actions/setup-java@v1, with: { java-version: "${{ env.JAVA_VERSION }}" } }
- run: sudo apt-get install xvfb
- run: xvfb-run --auto-servernum ./gradlew --no-daemon -DCI=true
- run: xvfb-run --auto-servernum ./gradlew --no-daemon jvmTest publishLinuxX64PublicationToMavenLocal -DCI=true
23 changes: 12 additions & 11 deletions .github/workflows/TEST.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ env:
CI: true
SKIP_KORGE_SAMPLES: true
DISPLAY: ":99"
JAVA_VERSION: 11

jobs:
changes:
Expand Down Expand Up @@ -86,12 +87,12 @@ jobs:
- { name: Configure local.properties, run: "echo org.gradle.parallel=true >> local.properties" }
- { name: Install freeglut3 & openal, run: sudo apt-get update && sudo apt-get -y install freeglut3-dev libopenal-dev xvfb }
- { name: Run Xvfb in Background, run: "Xvfb :99 &" }
- { name: Set up JDK 1.8, uses: actions/setup-java@v1, with: { java-version: 1.8 } }
- { name: Set up JDK, uses: actions/setup-java@v1, with: { java-version: "${{ env.JAVA_VERSION }}" } }
- { name: Gradle cache, uses: ./.github/actions/gradle-cache }
- { name: Grant execute permission for gradlew, run: chmod +x gradlew }
- { name: Start gradle, run: ./gradlew }
- { name: Building classes, run: ./gradlew --parallel compileTestKotlinJvm }
- { name: Testing JVM, run: "./gradlew --parallel jvmTest", env: { EGL_LOG_LEVEL: debug, LIBGL_DEBUG: verbose, LIBGL_ALWAYS_SOFTWARE: true, MESA_DEBUG: true } }
- { name: Start gradle, run: ./gradlew --stacktrace }
- { name: Building classes, run: ./gradlew --stacktrace --parallel compileTestKotlinJvm }
- { name: Testing JVM, run: "./gradlew --stacktrace --parallel jvmTest", env: { EGL_LOG_LEVEL: debug, LIBGL_DEBUG: verbose, LIBGL_ALWAYS_SOFTWARE: true, MESA_DEBUG: true } }
- { name: Archive Test Results, if: failure(), uses: actions/upload-artifact@v3, with: { name: screenshot-test-results-linux, retention-days: 21, path: "**/build/reports", if-no-files-found: ignore } }
- { name: Check sandbox compiles, run: "./gradlew :korge-sandbox:jvmJar" }
- { name: Publish to maven local, run: ./gradlew publishJvmLocal }
Expand All @@ -111,7 +112,7 @@ jobs:
- { uses: actions/checkout@v3 }
- { name: Install freeglut3 & openal, run: sudo apt-get update && sudo apt-get -y install freeglut3-dev libopenal-dev xvfb }
- { name: Run Xvfb in Background, run: "Xvfb :99 &" }
- { name: Set up JDK 1.8, uses: actions/setup-java@v1, with: { java-version: 1.8 } }
- { name: Set up JDK, uses: actions/setup-java@v1, with: { java-version: "${{ env.JAVA_VERSION }}" } }
- { name: Gradle cache, uses: ./.github/actions/gradle-cache }
- { name: Grant execute permission for gradlew, run: chmod +x gradlew }
- { name: Start gradle, run: ./gradlew }
Expand All @@ -138,7 +139,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- { uses: actions/checkout@v3 }
- { name: Set up JDK 1.8, uses: actions/setup-java@v1, with: { java-version: 1.8 } }
- { name: Set up JDK, uses: actions/setup-java@v1, with: { java-version: "${{ env.JAVA_VERSION }}" } }
- { name: Install freeglut3 & openal, run: sudo apt-get update && sudo apt-get -y install freeglut3-dev libopenal-dev }
- { name: Gradle cache, uses: ./.github/actions/gradle-cache }
- { name: Grant execute permission for gradlew, run: chmod +x gradlew }
Expand All @@ -155,7 +156,7 @@ jobs:
#runs-on: ubuntu-latest
steps:
- { uses: actions/checkout@v3 }
- { name: Set up JDK 1.8, uses: actions/setup-java@v1, with: { java-version: 1.8 } }
- { name: Set up JDK, uses: actions/setup-java@v1, with: { java-version: "${{ env.JAVA_VERSION }}" } }
#- { name: Install freeglut3 & openal, run: sudo apt-get update && sudo apt-get -y install freeglut3-dev libopenal-dev }
#- { name: Gradle cache, uses: ./.github/actions/gradle-cache }
- { name: Grant execute permission for gradlew, run: chmod +x gradlew }
Expand All @@ -175,7 +176,7 @@ jobs:
runs-on: macos-11
steps:
- { uses: actions/checkout@v3 }
- { name: Set up JDK 1.8, uses: actions/setup-java@v1, with: { java-version: 1.8 } }
- { name: Set up JDK, uses: actions/setup-java@v1, with: { java-version: "${{ env.JAVA_VERSION }}" } }
- { name: Gradle cache, uses: ./.github/actions/gradle-cache }
- { name: Grant execute permission for gradlew, run: chmod +x gradlew }
- { name: Start gradle, run: ./gradlew }
Expand All @@ -196,7 +197,7 @@ jobs:
- { uses: actions/checkout@v3 }
- { name: Install freeglut3 & openal, run: sudo apt-get update && sudo apt-get -y install freeglut3-dev libopenal-dev xvfb }
- { name: Run Xvfb in Background, run: "Xvfb :99 &" }
- { name: Set up JDK 1.8, uses: actions/setup-java@v1, with: { java-version: 1.8 } }
- { name: Set up JDK, uses: actions/setup-java@v1, with: { java-version: "${{ env.JAVA_VERSION }}" } }
- { name: Gradle cache, uses: ./.github/actions/gradle-cache }
- { name: Grant execute permission for gradlew, run: chmod +x gradlew }
- { name: Start gradle, run: ./gradlew }
Expand All @@ -218,7 +219,7 @@ jobs:
# DISABLE_HEADLESS_TEST: true
steps:
- { uses: actions/checkout@v3 }
- { name: Set up JDK 1.8, uses: actions/setup-java@v1, with: { java-version: 1.8 } }
- { name: Set up JDK, uses: actions/setup-java@v1, with: { java-version: "${{ env.JAVA_VERSION }}" } }
- { name: Gradle cache, uses: ./.github/actions/gradle-cache }
- { name: Grant execute permission for gradlew, run: chmod +x gradlew }
- { name: Start gradle, run: ./gradlew }
Expand All @@ -245,7 +246,7 @@ jobs:
- { name: Download, shell: cmd, run: "curl -L -o opengl32-x64.zip https://github.com/korlibs/mesa-dist-win/releases/download/21.2.3/opengl32-x64.zip" }
- { name: unzip, shell: cmd, run: "unzip opengl32-x64.zip" }
- { name: unzip to korge, shell: cmd, run: "unzip opengl32-x64.zip -d korge" }
- { name: Set up JDK 1.8, uses: actions/setup-java@v1, with: { java-version: 1.8 } }
- { name: Set up JDK, uses: actions/setup-java@v1, with: { java-version: "${{ env.JAVA_VERSION }}" } }
- { name: Gradle cache, uses: ./.github/actions/gradle-cache }
- { name: Testing JVM on windows, shell: cmd, run: "CALL gradlew.bat jvmTest", env: { EGL_LOG_LEVEL: debug, LIBGL_DEBUG: verbose, LIBGL_ALWAYS_SOFTWARE: true, MESA_DEBUG: true } }
- { name: Archive Test Results, if: failure(), uses: actions/upload-artifact@v3, with: { name: screenshot-test-results-windows, retention-days: 21, path: "**/build/reports", if-no-files-found: ignore } }
Expand Down
9 changes: 5 additions & 4 deletions .github/workflows/TEST.yml.disabled
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,18 @@ on:
pull_request:
branches: [ main ]

env:
JAVA_VERSION: 11


jobs:
build:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- name: Set up JDK 1.8
uses: actions/setup-java@v1
with:
java-version: 1.8
- { name: Set up JDK, uses: actions/setup-java@v1, with: { java-version: "${{ env.JAVA_VERSION }}" } }
- name: Grant execute permission for gradlew
run: chmod +x gradlew
- name: Testing JVM
Expand Down
6 changes: 2 additions & 4 deletions .github/workflows/TEST_SNAPSHOT.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ env:
# https://oss.sonatype.org/content/repositories/snapshots/org/jetbrains/kotlin/kotlin-compiler/1.5.255-SNAPSHOT/
FORCED_KOTLIN_VERSION: "1.7.255-SNAPSHOT"
SKIP_KORGE_SAMPLES: true
JAVA_VERSION: 11

jobs:
build:
Expand All @@ -23,10 +24,7 @@ jobs:

steps:
- uses: actions/checkout@v2
- name: Set up JDK 1.8
uses: actions/setup-java@v1
with:
java-version: 1.8
- { name: Set up JDK, uses: actions/setup-java@v1, with: { java-version: "${{ env.JAVA_VERSION }}" } }
- name: Grant execute permission for gradlew
run: chmod +x gradlew
- name: Start gradle
Expand Down
2 changes: 0 additions & 2 deletions @old/korte-korio/src/main/AndroidManifest.xml
View file
Open in desktop

This file was deleted.

Loading