Skip to content

Commit fbbbc65

Browse files
committed
v1.68.1 beta 0
- Lwjgl 3.2.2-3 - Shadow 4.0.4 - Kotlin 1.3.21 - Kotlintest 3.2.1 - Gradle 5.2.1
1 parent 554555c commit fbbbc65

File tree

3 files changed

+13
-10
lines changed

3 files changed

+13
-10
lines changed

build.gradle

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ import static org.gradle.internal.os.OperatingSystem.*
33
plugins {
44
id 'maven'
55
id 'java'
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
@@ -13,8 +13,8 @@ group = 'com.github.kotlin-graphics'
1313
ext{
1414
moduleName = 'com.github.kotlin_graphics.imgui'
1515
kotlin = 'org.jetbrains.kotlin:kotlin'
16-
kotlin_version = '1.3.11'
17-
kotlintest_version = '3.2.0'
16+
kotlin_version = '1.3.21'
17+
kotlintest_version = '3.2.1'
1818
lwjgl_version = "3.2.2-SNAPSHOT"
1919
lwjgl_natives = current() == WINDOWS ? "windows" : current() == LINUX ? "linux" : "macos"
2020
}
@@ -58,12 +58,12 @@ task lightJar(type: Jar) {
5858
}
5959

6060
task sourcesJar(type: Jar, dependsOn: classes) {
61-
classifier = 'sources'
61+
archiveClassifier = 'sources'
6262
from sourceSets.main.allSource
6363
}
6464

6565
task javadocJar(type: Jar, dependsOn: javadoc) {
66-
classifier = 'javadoc'
66+
archiveClassifier = 'javadoc'
6767
from javadoc.destinationDir
6868
}
6969

@@ -82,4 +82,6 @@ shadowJar {
8282
jar {
8383
inputs.property("moduleName", moduleName)
8484
manifest.attributes('Automatic-Module-Name': moduleName)
85-
}
85+
}
86+
87+
shadowJar.archiveClassifier = 'all'

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
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.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-all.zip

src/main/kotlin/imgui/imgui.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,12 +110,13 @@ object ImGui :
110110
imgui_internal {
111111

112112
// Version
113+
val build = 0
113114
val beta = 0
114115
/** get the compiled version string e.g. "1.23" */
115-
val version = "1.68.$beta"
116+
val version = "1.68.$build-$beta"
116117
/** Integer encoded as XYYZZ for use in #if preprocessor conditionals.
117118
Work in progress versions typically starts at XYY00 then bounced up to XYY01 when release tagging happens */
118-
val versionNum = 16800 + beta
119+
val versionNum = 16800 + build + beta / 10f
119120
}
120121

121122
var ptrIndices = 0

0 commit comments

Comments
 (0)