Skip to content

Commit 1c5ee04

Browse files
committed
Jigsaw support
Kotlin 1.3.10 v0.7
1 parent ac6df0d commit 1c5ee04

12 files changed

+32
-68
lines changed

.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_reflect_1_3_0.xml renamed to .idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_reflect_1_3_10.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_1_3_0.xml renamed to .idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_3_10.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_0.xml renamed to .idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_common_1_3_10.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_1_SNAPSHOT.xml

+2
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_1_SNAPSHOT_natives_windows.xml

+2
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_1_SNAPSHOT.xml

+2
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_1_SNAPSHOT_natives_windows.xml

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

.idea/modules.xml

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

.idea/modules/com.github.kotlin-graphics-kool.iml

-52
This file was deleted.

build.gradle

+10-1
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,11 @@ group = 'com.github.kotlin-graphics'
99

1010
apply plugin: 'com.github.johnrengelman.shadow'
1111

12+
ext.moduleName = 'com.github.kotlin_graphics.kool'
13+
1214
buildscript {
1315

14-
ext.kotlinVersion = '1.3.0'
16+
ext.kotlinVersion = '1.3.10'
1517

1618
repositories {
1719
jcenter() // shadow
@@ -75,4 +77,11 @@ task javadocJar(type: Jar, dependsOn: javadoc) {
7577
artifacts {
7678
archives sourcesJar
7779
// archives javadocJar
80+
}
81+
82+
jar {
83+
inputs.property("moduleName", moduleName)
84+
manifest {
85+
attributes('Automatic-Module-Name': moduleName)
86+
}
7887
}

kool.iml

+4-4
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-reflect/1.3.0/6fd129fd9ba8581f2cb9c58bfd431dda4ee0457e/kotlin-reflect-1.3.0.jar;C:/Users/gbarbieri/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.3.0/a134b0cfe9bb44f98b0b3e889cda07923eea9428/kotlin-stdlib-1.3.0.jar;C:/Users/gbarbieri/.gradle/caches/modules-2/files-2.1/org.lwjgl/lwjgl-jemalloc/3.2.1-SNAPSHOT/8507759e4c1df80cc7abca8d18a84c2a69e7912d/lwjgl-jemalloc-3.2.1-SNAPSHOT.jar;C:/Users/gbarbieri/.gradle/caches/modules-2/files-2.1/org.lwjgl/lwjgl/3.2.1-SNAPSHOT/722bb71543a134f4137e929705203c4dc97d3a55/lwjgl-3.2.1-SNAPSHOT.jar;C:/Users/gbarbieri/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.3.0/84a2e0288dc17cd64d692eb1e5e0de8cd5ff0846/kotlin-stdlib-common-1.3.0.jar;C:/Users/gbarbieri/.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-reflect/1.3.10/dd02865be0351707554b16a896b766b2396cdafa/kotlin-reflect-1.3.10.jar;C:/Users/elect/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.3.10/b178c1501609c6e4ee8be635513cb023a466457d/kotlin-stdlib-1.3.10.jar;C:/Users/elect/.gradle/caches/modules-2/files-2.1/org.lwjgl/lwjgl-jemalloc/3.2.1-SNAPSHOT/658e23f7f2cf2c5051bdd9b972b3d3ec17a580ff/lwjgl-jemalloc-3.2.1-SNAPSHOT.jar;C:/Users/elect/.gradle/caches/modules-2/files-2.1/org.lwjgl/lwjgl/3.2.1-SNAPSHOT/5c788aa37540920077bea494cb5c39f96c486026/lwjgl-3.2.1-SNAPSHOT.jar;C:/Users/elect/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.3.10/1b19d99229dcedad7caf50534dce38fe82845269/kotlin-stdlib-common-1.3.10.jar;C:/Users/elect/.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" />
@@ -38,11 +38,11 @@
3838
</content>
3939
<orderEntry type="inheritedJdk" />
4040
<orderEntry type="sourceFolder" forTests="false" />
41-
<orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-reflect:1.3.0" level="project" />
42-
<orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.3.0" level="project" />
41+
<orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-reflect:1.3.10" level="project" />
42+
<orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.3.10" level="project" />
4343
<orderEntry type="library" name="Gradle: org.lwjgl:lwjgl-jemalloc:3.2.1-SNAPSHOT" level="project" />
4444
<orderEntry type="library" name="Gradle: org.lwjgl:lwjgl:3.2.1-SNAPSHOT" level="project" />
45-
<orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.3.0" level="project" />
45+
<orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.3.10" level="project" />
4646
<orderEntry type="library" name="Gradle: org.jetbrains:annotations:13.0" level="project" />
4747
<orderEntry type="library" scope="RUNTIME" name="Gradle: org.lwjgl:lwjgl-jemalloc:3.2.1-SNAPSHOT:natives-windows" level="project" />
4848
<orderEntry type="library" scope="RUNTIME" name="Gradle: org.lwjgl:lwjgl:3.2.1-SNAPSHOT:natives-windows" level="project" />

src/main/kotlin/kool/stak.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -790,7 +790,7 @@ object stak {
790790
// val remaining get() = SIZE - consumed
791791
// val consumed get() = ptr.get() - address
792792

793-
val VERSION = "0.6"
793+
val VERSION = "0.7"
794794

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

0 commit comments

Comments
 (0)