v0.8.3.0-17

Author: elect86

.idea/misc.xml

@@ -1,45 +1,28 @@
-import org.gradle.api.attributes.java.TargetJvmVersion.TARGET_JVM_VERSION_ATTRIBUTE
-import org.gradle.internal.os.OperatingSystem.*
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-import java.net.URL
+import kx.LwjglModules.*
+import kx.KxProject.*
+import kx.kxImplementation
+import kx.lwjglImplementation
 
 plugins {
+    val build = "0.6.1"
+    id("kx.kotlin.11") version build
+    id("kx.lwjgl") version build
+    id("kx.dokka") version build
     java
-    kotlin("jvm") version "1.4.10"
     `maven-publish`
-    id("org.jetbrains.dokka") version "1.4.10"
-    id("com.github.johnrengelman.shadow").version("6.1.0")
 }
 
-group = "com.github.kotlin_graphics"
-val moduleName = "$group.gli"
-
-val kotestVersion = "4.2.5"
-val kx = "com.github.kotlin-graphics"
-val unsignedVersion: String by project
-val koolVersion: String by project
-val glmVersion: String by project
-val lwjglVersion = "3.2.3"
-val lwjglNatives = "natives-" + when (current()) {
-    WINDOWS -> "windows"
-    LINUX -> "linux"
-    else -> "macos"
-}
+group = "com.github.kotlin.graphics"
+version = "0.8.3.0-17"
 
 repositories {
-    mavenCentral()
-    jcenter()
+    maven("https://repo.repsy.io/mvn/elect/kx")
     maven("https://jitpack.io")
 }
 
 dependencies {
-    implementation(kotlin("stdlib-jdk8"))
 
-    implementation(platform("$kx.glm:bom:$glmVersion"))
-
-    implementation("$kx:kotlin-unsigned")
-    implementation("$kx:kool")
-    implementation("$kx:glm:$glmVersion")
+    kxImplementation(unsigned, kool, glm)
 
     // https://mvnrepository.com/artifact/com.twelvemonkeys.imageio/imageio-core
     listOf(/*"-batik",*/ "-bmp", "-core", "-icns", "-iff", "-jpeg", "-metadata", "-pcx", "-pdf", "-pict", "-pnm",
@@ -49,82 +32,11 @@ dependencies {
     // https://mvnrepository.com/artifact/org.apache.xmlgraphics/batik-transcoder
     //implementation "org.apache.xmlgraphics:batik-transcoder:1.12"
 
-    implementation(platform("org.lwjgl:lwjgl-bom:$lwjglVersion"))
-    listOf("", "-jemalloc", "-opengl").forEach {
-        implementation("org.lwjgl", "lwjgl$it")
-        runtimeOnly("org.lwjgl", "lwjgl$it", classifier = lwjglNatives)
-    }
-
-    testImplementation("io.kotest:kotest-runner-junit5-jvm:$kotestVersion")
-    testImplementation("io.kotest:kotest-assertions-core-jvm:$kotestVersion")
-}
-
-java { modularity.inferModulePath.set(true) }
-
-tasks {
-    dokkaHtml {
-        dokkaSourceSets.configureEach {
-            sourceLink {
-                localDirectory.set(file("src/main/kotlin"))
-                remoteUrl.set(URL("https://github.com/kotlin-graphics/gli/tree/master/src/main/kotlin"))
-                remoteLineSuffix.set("#L")
-            }
-        }
-    }
-
-    withType<KotlinCompile>().all {
-        kotlinOptions {
-            jvmTarget = "11"
-            freeCompilerArgs += listOf("-Xinline-classes", "-Xopt-in=kotlin.RequiresOptIn")
-        }
-        sourceCompatibility = "11"
-    }
-
-    compileJava { // this is needed because we have a separate compile step in this example with the 'module-info.java' is in 'main/java' and the Kotlin code is in 'main/kotlin'
-        options.compilerArgs = listOf("--patch-module", "$moduleName=${sourceSets.main.get().output.asPath}")
-    }
-
-    withType<Test> { useJUnitPlatform() }
-}
-
-val dokkaJavadocJar by tasks.register<Jar>("dokkaJavadocJar") {
-    dependsOn(tasks.dokkaJavadoc)
-    from(tasks.dokkaJavadoc.get().outputDirectory.get())
-    archiveClassifier.set("javadoc")
-}
-
-val dokkaHtmlJar by tasks.register<Jar>("dokkaHtmlJar") {
-    dependsOn(tasks.dokkaHtml)
-    from(tasks.dokkaHtml.get().outputDirectory.get())
-    archiveClassifier.set("html-doc")
-}
-
-val sourceJar = task("sourceJar", Jar::class) {
-    dependsOn(tasks.classes)
-    archiveClassifier.set("sources")
-    from(sourceSets.main.get().allSource)
-}
-
-artifacts {
-    archives(dokkaJavadocJar)
-    archives(dokkaHtmlJar)
-    archives(sourceJar)
+    lwjglImplementation(jemalloc, opengl)
 }
 
 publishing {
     publications.create<MavenPublication>("mavenJava") {
         from(components["java"])
-        artifact(sourceJar)
     }
-    repositories.maven {
-        name = "GitHubPackages"
-        url = uri("https://maven.pkg.github.com/kotlin-graphics/gli")
-        credentials {
-            username = System.getenv("GITHUB_ACTOR")
-            password = System.getenv("GITHUB_TOKEN")
-        }
-    }
-}
-
-// == Add access to the 'modular' variant of kotlin("stdlib"): Put this into a buildSrc plugin and reuse it in all your subprojects
-configurations.all { attributes.attribute(TARGET_JVM_VERSION_ATTRIBUTE, 11) }
+}

bom/build.gradle.kts

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip

build.gradle.kts

@@ -1,2 +1,6 @@
 jdk:
-  - openjdk11
+  - openjdk11
+
+install:
+  - echo "Running a custom install command"
+  - ./gradlew clean assemble -x dokkaHtml -x dokkaHtmlJar -x javadoc -x dokkaJavadocJar publishToMavenLocal

gradle/wrapper/gradle-wrapper.properties

@@ -1,3 +1,8 @@
 rootProject.name = "gli"
 
-include("bom")
+pluginManagement {
+    repositories {
+        gradlePluginPortal()
+        maven("https://repo.repsy.io/mvn/elect/kx")
+    }
+}

jitpack.yml

@@ -1,13 +1,13 @@
-module com.github.kotlin_graphics.gli {
+module com.github.kotlin.graphics.gli {
 
     requires java.desktop;
     requires kotlin.stdlib;
 
     requires org.lwjgl;
 
-    requires com.github.kotlin_graphics.glm;
-    requires com.github.kotlin_graphics.kool;
-    requires com.github.kotlin_graphics.kotlin_unsigned;
+    requires com.github.kotlin.graphics.glm;
+    requires com.github.kotlin.graphics.kool;
+    requires com.github.kotlin.graphics.unsigned;
 
     exports gli_;
 }

settings.gradle.kts

@@ -65,5 +65,5 @@ const val GLI_VERSION_MAJOR = 0
 const val GLI_VERSION_MINOR = 8
 const val GLI_VERSION_PATCH = 3
 const val GLI_VERSION_REVISION = 0
-const val GLI_VERSION_BUILD = 16
+const val GLI_VERSION_BUILD = 17
 const val GLI_VERSION = GLI_VERSION_MAJOR * 1_000 + GLI_VERSION_MINOR * 100 + GLI_VERSION_PATCH * 10 + GLI_VERSION_REVISION + GLI_VERSION_BUILD / 10f