Skip to content

Commit 9378d28

Browse files
authored
Merge pull request #340 from SpaiR/fix/ci-build
Upgrade Gradle to 8.14.3
2 parents 2e78d9d + 7678374 commit 9378d28

File tree

7 files changed

+17
-18
lines changed

7 files changed

+17
-18
lines changed

.github/workflows/ci.yml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@ jobs:
2424
uses: actions/setup-java@v4
2525
with:
2626
distribution: liberica
27-
java-version: 17
27+
java-version: |
28+
8
29+
17
2830
2931
- name: Setup Gradle
3032
uses: gradle/actions/setup-gradle@v4
@@ -71,7 +73,9 @@ jobs:
7173
uses: actions/setup-java@v4
7274
with:
7375
distribution: liberica
74-
java-version: 17
76+
java-version: |
77+
8
78+
17
7579
7680
- name: Setup Gradle
7781
uses: gradle/actions/setup-gradle@v4
@@ -158,7 +162,9 @@ jobs:
158162
uses: actions/setup-java@v4
159163
with:
160164
distribution: liberica
161-
java-version: 17
165+
java-version: |
166+
8
167+
17
162168
163169
- name: Setup Gradle
164170
uses: gradle/actions/setup-gradle@v4

buildSrc/build.gradle.kts

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,6 @@ plugins {
33
`kotlin-dsl`
44
}
55

6-
java {
7-
toolchain {
8-
languageVersion.set(JavaLanguageVersion.of(11))
9-
}
10-
}
11-
126
repositories {
137
mavenCentral()
148
}

gradle/wrapper/gradle-wrapper.jar

181 Bytes
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

gradlew

Lines changed: 4 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gradlew.bat

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

settings.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
plugins {
2-
id("org.gradle.toolchains.foojay-resolver-convention") version("0.9.0")
2+
id("org.gradle.toolchains.foojay-resolver-convention") version("0.10.0")
33
}
44

55
rootProject.name = "imgui-java"

0 commit comments

Comments
 (0)