Skip to content

Commit 12cd334

Browse files
committed
v0.8.3.0-17
1 parent 6e88ff6 commit 12cd334

File tree

7 files changed

+110
-40
lines changed

7 files changed

+110
-40
lines changed

.github/workflows/build.yml

Lines changed: 51 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,80 @@
11
name: build
22

3-
on: [push]
3+
on: [ push ]
44

55
jobs:
66
linux:
77
name: 'Linux'
88
runs-on: ubuntu-latest
99

1010
steps:
11-
- uses: actions/checkout@v2
12-
- name: Set up JDK 1.11
13-
uses: actions/setup-java@v1
14-
with:
15-
java-version: 11
16-
- name: Grant execute permission for gradlew
17-
run: chmod +x gradlew
18-
- name: Build with Gradle
19-
run: ./gradlew build
20-
21-
windows:
11+
- uses: actions/checkout@v2
12+
- uses: gradle/wrapper-validation-action@v1
13+
- name: Set up JDK 1.11
14+
uses: actions/setup-java@v1
15+
with:
16+
java-version: 11
17+
- name: Grant execute permission for gradlew
18+
run: chmod +x gradlew
19+
# - name: Build with Gradle
20+
# run: ./gradlew build -x dokkaHtml -x dokkaHtmlJar
21+
- uses: burrunan/gradle-cache-action@v1
22+
name: Build scenery
23+
with:
24+
arguments: build -x dokkaHtml -x dokkaHtmlJar -x javadoc -x dokkaJavadocJar
25+
# - name: Cleanup Gradle Cache
26+
# # Remove some files from the Gradle cache, so they aren't cached by GitHub Actions.
27+
# # Restoring these files from a GitHub Actions cache might cause problems for future builds.
28+
# run: |
29+
# rm -f ~/.gradle/caches/modules-2/modules-2.lock
30+
# rm -f ~/.gradle/caches/modules-2/gc.properties
31+
32+
windows:
2233
name: 'Windows'
2334
runs-on: windows-latest
2435

2536
steps:
2637
- uses: actions/checkout@v2
38+
- uses: gradle/wrapper-validation-action@v1
2739
- name: Set up JDK 1.11
2840
uses: actions/setup-java@v1
2941
with:
3042
java-version: 11
31-
- name: Build with Gradle
32-
run: .\gradlew.bat build
33-
34-
mac:
43+
# - name: Build with Gradle
44+
# run: .\gradlew.bat build -x dokkaHtml -x dokkaHtmlJar
45+
- uses: burrunan/gradle-cache-action@v1
46+
name: Build scenery
47+
with:
48+
arguments: build -x dokkaHtml -x dokkaHtmlJar -x javadoc -x dokkaJavadocJar
49+
# - name: Cleanup Gradle Cache
50+
# # Remove some files from the Gradle cache, so they aren't cached by GitHub Actions.
51+
# # Restoring these files from a GitHub Actions cache might cause problems for future builds.
52+
# run: |
53+
# rm -f ~/.gradle/caches/modules-2/modules-2.lock
54+
# rm -f ~/.gradle/caches/modules-2/gc.properties
55+
56+
mac:
3557
name: 'Mac OS'
3658
runs-on: macos-latest
3759

3860
steps:
3961
- uses: actions/checkout@v2
62+
- uses: gradle/wrapper-validation-action@v1
4063
- name: Set up JDK 1.11
4164
uses: actions/setup-java@v1
4265
with:
4366
java-version: 11
4467
- name: Grant execute permission for gradlew
4568
run: chmod +x gradlew
46-
- name: Build with Gradle
47-
run: ./gradlew build
69+
# - name: Build with Gradle
70+
# run: ./gradlew build -x dokkaHtml -x dokkaHtmlJar
71+
- uses: burrunan/gradle-cache-action@v1
72+
name: Build scenery
73+
with:
74+
arguments: build -x dokkaHtml -x dokkaHtmlJar -x javadoc -x dokkaJavadocJar
75+
# - name: Cleanup Gradle Cache
76+
# # Remove some files from the Gradle cache, so they aren't cached by GitHub Actions.
77+
# # Restoring these files from a GitHub Actions cache might cause problems for future builds.
78+
# run: |
79+
# rm -f ~/.gradle/caches/modules-2/modules-2.lock
80+
# rm -f ~/.gradle/caches/modules-2/gc.properties

.idea/runConfigurations/gli__clean_assemble__no_docs_.xml

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

.idea/runConfigurations/gli__clean_build__no_docs_.xml

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

build.gradle.kts

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,17 @@ import kx.kxImplementation
44
import kx.lwjglImplementation
55

66
plugins {
7-
val build = "0.6.1"
7+
val build = "0.6.6"
88
id("kx.kotlin.11") version build
99
id("kx.lwjgl") version build
1010
id("kx.dokka") version build
11+
id("kx.jitpack") version build
1112
java
12-
`maven-publish`
1313
}
1414

15-
group = "com.github.kotlin.graphics"
1615
version = "0.8.3.0-17"
1716

1817
repositories {
19-
maven("https://repo.repsy.io/mvn/elect/kx")
2018
maven("https://jitpack.io")
2119
}
2220

@@ -33,10 +31,4 @@ dependencies {
3331
//implementation "org.apache.xmlgraphics:batik-transcoder:1.12"
3432

3533
lwjglImplementation(jemalloc, opengl)
36-
}
37-
38-
publishing {
39-
publications.create<MavenPublication>("mavenJava") {
40-
from(components["java"])
41-
}
4234
}

gradle.properties

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,2 @@
1-
org.gradle.jvmargs=-XX:MaxMetaspaceSize=512m
2-
3-
unsignedVersion = 43908d7c
4-
koolVersion = 77c83e13
5-
glmVersion = 062a3f10
1+
org.gradle.jvmargs=-XX:MaxMetaspaceSize=1g
2+
org.gradle.daemon=false

jitpack.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
jdk:
22
- openjdk11
33

4-
install:
5-
- echo "Running a custom install command"
6-
- ./gradlew clean assemble -x dokkaHtml -x dokkaHtmlJar -x javadoc -x dokkaJavadocJar publishToMavenLocal
4+
#install:
5+
# - echo "Running a custom install command"
6+
# - ./gradlew clean assemble -x dokkaHtml -x dokkaHtmlJar -x javadoc -x dokkaJavadocJar publishToMavenLocal

src/main/java/module-info.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
module com.github.kotlin.graphics.gli {
1+
module kotlin.graphics.gli {
22

33
requires java.desktop;
44
requires kotlin.stdlib;
55

66
requires org.lwjgl;
77

8-
requires com.github.kotlin.graphics.glm;
9-
requires com.github.kotlin.graphics.kool;
10-
requires com.github.kotlin.graphics.unsigned;
8+
requires kotlin.graphics.glm;
9+
requires kotlin.graphics.kool;
10+
requires kotlin.graphics.unsigned;
1111

1212
exports gli_;
1313
}

0 commit comments

Comments
 (0)