Skip to content

Commit 7c3dfaf

Browse files
committed
v0.8.1
Lwjgl 3.2.2-3 Kotlin 1.3.21 Shadow 4.0.4 Gradle 5.2.1 with Shadow workaround
1 parent 5e63793 commit 7c3dfaf

12 files changed

+71
-26
lines changed

.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_3_11.xml renamed to .idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_3_21.xml

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_common_1_3_11.xml renamed to .idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_common_1_3_21.xml

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/libraries/Gradle__org_lwjgl_lwjgl_3_2_2_SNAPSHOT.xml

+11
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/libraries/Gradle__org_lwjgl_lwjgl_3_2_2_SNAPSHOT_natives_windows.xml

+11
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/libraries/Gradle__org_lwjgl_lwjgl_jemalloc_3_2_2_SNAPSHOT.xml

+11
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/libraries/Gradle__org_lwjgl_lwjgl_jemalloc_3_2_2_SNAPSHOT_natives_windows.xml

+11
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/modules.xml

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

build.gradle

+8-6
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@ import static org.gradle.internal.os.OperatingSystem.*
33
plugins {
44
id 'java'
55
id 'maven'
6-
id "org.jetbrains.kotlin.jvm" version "1.3.11"
7-
id "com.github.johnrengelman.shadow" version '4.0.3'
6+
id "org.jetbrains.kotlin.jvm" version "1.3.21"
7+
id "com.github.johnrengelman.shadow" version '4.0.4'
88
}
99

1010
// jitpack
1111
group = 'com.github.kotlin-graphics'
1212

1313
ext{
1414
moduleName = 'com.github.kotlin_graphics.kool'
15-
lwjgl_version = "3.2.1"
15+
lwjgl_version = "3.2.2-SNAPSHOT"
1616
lwjgl_natives = current() == WINDOWS ? "windows" : current() == LINUX ? "linux" : "macos"
1717
}
1818

@@ -32,12 +32,12 @@ repositories {
3232
}
3333

3434
task sourcesJar(type: Jar, dependsOn: classes) {
35-
classifier = 'sources'
35+
archiveClassifier = 'sources'
3636
from sourceSets.main.allSource
3737
}
3838

3939
task javadocJar(type: Jar, dependsOn: javadoc) {
40-
classifier = 'javadoc'
40+
archiveClassifier = 'javadoc'
4141
from javadoc.destinationDir
4242
}
4343

@@ -49,4 +49,6 @@ artifacts {
4949
jar {
5050
inputs.property("moduleName", moduleName)
5151
manifest.attributes('Automatic-Module-Name': moduleName)
52-
}
52+
}
53+
54+
shadowJar.archiveClassifier = 'all'

gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-5.0-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-all.zip

kool.iml

+9-9
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<compilerSettings />
77
<compilerArguments>
88
<option name="destination" value="$MODULE_DIR$/build/classes/kotlin/main" />
9-
<option name="classpath" value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.3.11/4cbc5922a54376018307a731162ccaf3ef851a39/kotlin-stdlib-1.3.11.jar:/home/elect/.gradle/caches/modules-2/files-2.1/org.lwjgl/lwjgl-jemalloc/3.2.1/7a0c583fcbec32b15784f846df536e1837d83666/lwjgl-jemalloc-3.2.1.jar:/home/elect/.gradle/caches/modules-2/files-2.1/org.lwjgl/lwjgl/3.2.1/2bb514e444994c6fece99a21f76e0c90438e377f/lwjgl-3.2.1.jar:/home/elect/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.3.11/d8b8e746e279f1c4f5e08bc14a96b82e6bb1de02/kotlin-stdlib-common-1.3.11.jar:/home/elect/.gradle/caches/modules-2/files-2.1/org.jetbrains/annotations/13.0/919f0dfe192fb4e063e7dacadee7f8bb9a2672a9/annotations-13.0.jar" />
9+
<option name="classpath" value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.3.21/4bcc2012b84840e19e1e28074284cac908be0295/kotlin-stdlib-1.3.21.jar;C:/Users/gbarbieri/.gradle/caches/modules-2/files-2.1/org.lwjgl/lwjgl-jemalloc/3.2.2-SNAPSHOT/feab1abc7277e85d56af3c20444276b3e1f02ca/lwjgl-jemalloc-3.2.2-SNAPSHOT.jar;C:/Users/gbarbieri/.gradle/caches/modules-2/files-2.1/org.lwjgl/lwjgl/3.2.2-SNAPSHOT/e0b078c15e200e5d3fe7a875e51506c2cc3f7dc0/lwjgl-3.2.2-SNAPSHOT.jar;C:/Users/gbarbieri/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.3.21/f30e4a9897913e53d778f564110bafa1fef46643/kotlin-stdlib-common-1.3.21.jar;C:/Users/gbarbieri/.gradle/caches/modules-2/files-2.1/org.jetbrains/annotations/13.0/919f0dfe192fb4e063e7dacadee7f8bb9a2672a9/annotations-13.0.jar" />
1010
<option name="noStdlib" value="true" />
1111
<option name="noReflect" value="true" />
1212
<option name="moduleName" value="kool" />
@@ -41,14 +41,14 @@
4141
</content>
4242
<orderEntry type="inheritedJdk" />
4343
<orderEntry type="sourceFolder" forTests="false" />
44-
<orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.3.11" level="project" />
45-
<orderEntry type="library" name="Gradle: org.lwjgl:lwjgl-jemalloc:3.2.1" level="project" />
46-
<orderEntry type="library" name="Gradle: org.lwjgl:lwjgl:3.2.1" level="project" />
47-
<orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.3.11" level="project" />
44+
<orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.3.21" level="project" />
45+
<orderEntry type="library" name="Gradle: org.lwjgl:lwjgl-jemalloc:3.2.2-SNAPSHOT" level="project" />
46+
<orderEntry type="library" name="Gradle: org.lwjgl:lwjgl:3.2.2-SNAPSHOT" level="project" />
47+
<orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.3.21" level="project" />
4848
<orderEntry type="library" name="Gradle: org.jetbrains:annotations:13.0" level="project" />
49-
<orderEntry type="library" scope="RUNTIME" name="Gradle: org.lwjgl:lwjgl-jemalloc:3.2.1:natives-linux" level="project" />
50-
<orderEntry type="library" scope="RUNTIME" name="Gradle: org.lwjgl:lwjgl:3.2.1:natives-linux" level="project" />
51-
<orderEntry type="library" scope="TEST" name="Gradle: org.lwjgl:lwjgl-jemalloc:3.2.1:natives-linux" level="project" />
52-
<orderEntry type="library" scope="TEST" name="Gradle: org.lwjgl:lwjgl:3.2.1:natives-linux" level="project" />
49+
<orderEntry type="library" scope="RUNTIME" name="Gradle: org.lwjgl:lwjgl-jemalloc:3.2.2-SNAPSHOT:natives-windows" level="project" />
50+
<orderEntry type="library" scope="RUNTIME" name="Gradle: org.lwjgl:lwjgl:3.2.2-SNAPSHOT:natives-windows" level="project" />
51+
<orderEntry type="library" scope="TEST" name="Gradle: org.lwjgl:lwjgl-jemalloc:3.2.2-SNAPSHOT:natives-windows" level="project" />
52+
<orderEntry type="library" scope="TEST" name="Gradle: org.lwjgl:lwjgl:3.2.2-SNAPSHOT:natives-windows" level="project" />
5353
</component>
5454
</module>

src/main/kotlin/kool/operators.kt

+1-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@ inline fun <reified T : Enum<T>> IntArray() = IntArray(enumValues<T>().size)
1515
/** for opengl */
1616
inline fun <reified E : Enum<E>> IntBuffer() = IntBuffer(enumValues<E>().size)
1717

18-
/** glGenTextures(textureName[Tex.Color]) */
19-
operator fun <E : Enum<E>, T> Array<T>.get(enum: Enum<E>): T = get(enum.ordinal)
18+
//operator fun <E : Enum<E>, T> Array<T>.get(enum: Enum<E>): T = get(enum.ordinal)
2019

2120

2221
operator fun <T : Struct, SELF : StructBuffer<T, SELF>> StructBuffer<T, SELF>.set(index: Int, value: T) {

src/main/kotlin/kool/stak.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -836,7 +836,7 @@ object stak {
836836
// val remaining get() = SIZE - consumed
837837
// val consumed get() = ptr.get() - address
838838

839-
val VERSION = "0.8"
839+
val VERSION = "0.8.1"
840840

841841
inline operator fun <R> invoke(block: (MemoryStack) -> R): R {
842842
val stack = MemoryStack.stackGet()

0 commit comments

Comments
 (0)