Skip to content

Commit

Permalink
[Core] Support to JDK 20
Browse files Browse the repository at this point in the history
  • Loading branch information
squid233 committed Mar 22, 2023
1 parent af00642 commit 6e0734b
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 30 deletions.
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: Bug report
description: Create a report to help us improve
title: "[GLib-#] "
labels: [ "bug", "P4" ]
title: "[Core-#] "
labels: [ "bug", "P3", "Status: Draft" ]
assignees:
- "squid233"
body:
Expand Down
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/feature_request.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: Feature request
description: Suggest an idea for this project
title: "[GLib-#] "
labels: [ "enhancement","P5" ]
title: "[Core-#] "
labels: [ "enhancement", "P5", "Status: Draft" ]
assignees:
- "squid233"
body:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
strategy:
matrix:
java: [
20-ea
20
]
os: [ ubuntu-latest, windows-latest ]
runs-on: ${{ matrix.os }}
Expand All @@ -33,7 +33,7 @@ jobs:
with:
arguments: build
- name: capture build artifacts
if: ${{ runner.os == 'Linux' && matrix.java == '20-ea' }}
if: ${{ runner.os == 'Linux' && matrix.java == '20' }}
uses: actions/upload-artifact@v3
with:
name: Artifacts
Expand Down
13 changes: 7 additions & 6 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ group = projGroupId
version = projVersion

project(":core").ext.subName = ''
for (String p : ['glfw', 'joml', 'opengl', 'stb',
'samples']) {
project(":$p").ext.subName = "-$p"
for (Artifact module : Artifact.VALUES) {
project(module.subprojectName).ext.subName = "-${module.subprojectName.substring(1)}"
}
project(":samples").ext.subName = "samples"

enum NativePlatform {
WIN_32("windows", "x86", "windows-x86", "", ".dll", "Win32"),
Expand Down Expand Up @@ -117,6 +117,7 @@ enum Artifact {
// "A new generation graphics and compute API that provides high-efficiency, cross-platform access to modern GPUs used in a wide variety of devices from PCs and consoles to mobile phones and embedded platforms.",
// ":vulkan", "Vulkan", null),

static final Artifact[] VALUES = values()
private final String artifactName
private final String projectName
private final String projectDescription
Expand Down Expand Up @@ -310,7 +311,7 @@ void appendBOM(org.w3c.dom.Node dependencies, NativePlatform platform, Artifact
}

publishing.publications {
for (Artifact module : Artifact.values()) {
for (Artifact module : Artifact.VALUES) {
create("maven${module.mavenName}", MavenPublication) {
groupId = projGroupId
artifactId = module.artifactName
Expand Down Expand Up @@ -365,7 +366,7 @@ publishing.publications {
withXml {
def dependencyManagement = asElement().getElementsByTagName("dependencyManagement").item(0)
def dependencies = asElement().getElementsByTagName("dependencies").item(0)
for (Artifact module : Artifact.values()) {
for (Artifact module : Artifact.VALUES) {
if (module.nativeBinding != null) {
for (NativePlatform platform : module.nativeBinding.platforms) {
appendBOM(dependencies, platform, module)
Expand Down Expand Up @@ -400,7 +401,7 @@ publishing.repositories {

dependencies {
constraints {
for (Artifact module : Artifact.values()) {
for (Artifact module : Artifact.VALUES) {
api "io.github.over-run:${module.artifactName}:$version"
}
}
Expand Down
17 changes: 0 additions & 17 deletions doc/notes/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,23 +12,6 @@ These features are candidates:

- (0.1.0) STB true-type

### Goals

Our goal is to support these libraries with full document:

- [x] [GLFW](https://www.glfw.org/) 3.3.8 (Currently 100%)
- [ ] [OpenGL](https://www.khronos.org/opengl/) 4.6 (Currently 39%)
- [ ] [STB](https://github.com/nothings/stb) (Currently 23%)
- [ ] [Vulkan](https://www.vulkan.org/) (Currently 0%)
- [ ] [OpenAL](https://www.openal.org/) (Currently 0%)
- [ ] [FreeType](https://freetype.org/) (Currently 0%)

Checked item means it is full functional but might be not documented.

| Total Progress |
|:--------------------------------------------------------------:|
| ![total progress](https://progress-bar.dev/27/?title=progress) |

### Drafts

These features are drafts. The contents are subject to change until release.
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-rc-1-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

0 comments on commit 6e0734b

Please sign in to comment.