Skip to content

Commit 43cb7b5

Browse files
committed
0.7.10
1 parent e2e97bb commit 43cb7b5

File tree

8 files changed

+58
-36
lines changed

8 files changed

+58
-36
lines changed

.idea/kotlinScripting.xml

Lines changed: 0 additions & 6 deletions
This file was deleted.

.idea/misc.xml

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

awt/awt.gradle.kts

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
import kx.*
2+
import org.lwjgl.Lwjgl
3+
import org.lwjgl.Lwjgl.Module.*
4+
5+
plugins {
6+
fun kx(vararg p: String) = p.forEach { id("io.github.kotlin-graphics.$it") }
7+
kx("align", "base", "publish", "utils")
8+
id("org.lwjgl.plugin")
9+
}
10+
11+
version = rootProject.version
12+
13+
dependencies {
14+
implementation(projects.core)
15+
implementation(kool, glm, gln)
16+
Lwjgl { implementation(jawt, glfw, jemalloc, opengl) }
17+
}

build.gradle.kts

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,37 @@
11
import kx.*
2-
import kx.Lwjgl
3-
import kx.Lwjgl.Modules.*
4-
import kx.implementation
2+
import org.lwjgl.Lwjgl
3+
import org.lwjgl.Lwjgl.Module.*
54

65
plugins {
7-
val build = "0.7.3+51"
8-
id("kx.kotlin") version build
9-
// id("kx.dokka") version build
10-
id("kx.publish") version build
11-
id("kx.dynamic-align") version build
12-
id("kx.util") version build
6+
for ((p, v) in listOf("align" to "0.0.7",
7+
"base" to "0.0.10",
8+
"publish" to "0.0.6",
9+
"utils" to "0.0.5"))
10+
id("io.github.kotlin-graphics.$p") version v
11+
id("org.lwjgl.plugin") version "0.0.20"
1312
}
1413

15-
subprojects {
16-
apply(plugin = "kx.kotlin")
17-
apply(plugin = "kx.publish")
18-
apply(plugin = "kx.dynamic-align")
19-
apply(plugin = "kx.util")
14+
dependencies {
15+
subprojects.forEach(::implementation)
2016
}
2117

22-
dependencies {
23-
project.subprojects.forEach(::implementation)
18+
subprojects {
19+
version = rootProject.version
20+
fun kx(vararg p: String) = p.forEach { apply(plugin = "io.github.kotlin-graphics.$it") }
21+
kx("align", "base", "publish", "utils")
2422
}
2523

26-
project(":core").dependencies {
24+
projects.core.dependencyProject.dependencies {
2725
implementation(kotlin("reflect"))
2826
implementation(unsigned, kool, glm, gli, gln)
2927
Lwjgl { implementation(glfw, jemalloc, opengl) }
3028
}
31-
project(":awt").dependencies {
29+
projects.awt.dependencyProject.dependencies {
3230
implementation(projects.core)
3331
implementation(kool, glm, gln)
3432
Lwjgl { implementation(jawt, glfw, jemalloc, opengl) }
3533
}
36-
project(":vk").dependencies {
34+
projects.vk.dependencyProject.dependencies {
3735
implementation(projects.core)
3836
implementation(kool, vkk)
3937
Lwjgl { implementation(glfw, jemalloc, opengl, vulkan) }

core/core.gradle.kts

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
import kx.*
2+
import org.lwjgl.Lwjgl
3+
import org.lwjgl.Lwjgl.Module.*
4+
5+
plugins {
6+
fun kx(vararg p: String) = p.forEach { id("io.github.kotlin-graphics.$it") }
7+
kx("align", "base", "publish", "utils")
8+
id("org.lwjgl.plugin")
9+
}
10+
11+
version = rootProject.version
12+
13+
dependencies {
14+
implementation(kotlin("reflect"))
15+
implementation(unsigned, kool, glm, gli, gln)
16+
Lwjgl { implementation(glfw, jemalloc, opengl) }
17+
}
File renamed without changes.
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
4-
distributionSha256Sum=f581709a9c35e9cb92e16f585d2c4bc99b2b1a5f85d2badbd3dc6bff59e1e6dd
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
4+
distributionSha256Sum=de8f52ad49bdc759164f72439a3bf56ddb1589c4cde802d3cec7d6ad0e0ee410
55
zipStoreBase=GRADLE_USER_HOME
66
zipStorePath=wrapper/dists

settings.gradle.kts

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,21 +13,20 @@ pluginManagement {
1313
gradlePluginPortal()
1414
maven("https://raw.githubusercontent.com/kotlin-graphics/mary/master")
1515
}
16-
// includeBuild("../build-logic")
17-
// includeBuild("../magik")
16+
// includeBuild("../build-logic")
17+
// includeBuild("../magik")
1818
}
1919

20-
rootProject.name = "uno"
21-
2220
include("core", "awt", "vk")
2321

24-
enableFeaturePreview("VERSION_CATALOGS")
22+
rootProject.name = "uno"
23+
2524
enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
2625

2726
//prefix("uno")
2827
//postfix("jdk8")
2928

3029
gradle.rootProject {
3130
group = "kotlin.graphics"
32-
version = "0.7.9+52"
31+
version = "0.7.10"
3332
}

0 commit comments

Comments
 (0)