Skip to content

Commit cdd2744

Browse files
elect86elect86
committed
0.7.11
1 parent 43cb7b5 commit cdd2744

File tree

10 files changed

+121
-53
lines changed

10 files changed

+121
-53
lines changed

‎.idea/kotlinc.xml‎

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

‎.idea/php.xml‎

Lines changed: 12 additions & 0 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: 27 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,37 @@
1-
import kx.*
2-
import org.lwjgl.Lwjgl
3-
import org.lwjgl.Lwjgl.Module.*
1+
import magik.createGithubPublication
2+
import org.lwjgl.lwjgl
3+
import org.lwjgl.lwjgl.Module.*
44

55
plugins {
6-
fun kx(vararg p: String) = p.forEach { id("io.github.kotlin-graphics.$it") }
7-
kx("align", "base", "publish", "utils")
6+
kotlin("jvm")
87
id("org.lwjgl.plugin")
8+
id("elect86.magik")
9+
`maven-publish`
910
}
1011

1112
version = rootProject.version
1213

1314
dependencies {
1415
implementation(projects.core)
15-
implementation(kool, glm, gln)
16-
Lwjgl { implementation(jawt, glfw, jemalloc, opengl) }
16+
17+
implementation("kotlin.graphics:gln:0.5.31")
18+
implementation("kotlin.graphics:glm:0.9.9.1-5")
19+
implementation("kotlin.graphics:kool:0.9.68")
20+
21+
lwjgl { implementation(jawt, glfw, jemalloc, opengl) }
22+
}
23+
24+
publishing {
25+
publications {
26+
createGithubPublication {
27+
from(components["java"])
28+
suppressAllPomMetadataWarnings()
29+
}
30+
}
31+
repositories {
32+
maven {
33+
name = "local"
34+
url = uri(layout.buildDirectory.file(name))
35+
}
36+
}
1737
}

‎awt/src/main/java/module-info.java‎ renamed to ‎awt/src/main/java/module-info‎

File renamed without changes.

‎build.gradle.kts‎

Lines changed: 26 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,34 @@
1-
import kx.*
2-
import org.lwjgl.Lwjgl
3-
import org.lwjgl.Lwjgl.Module.*
1+
import magik.createGithubPublication
2+
import org.gradle.kotlin.dsl.dependencies
3+
import org.gradle.kotlin.dsl.embeddedKotlinVersion
4+
import org.gradle.kotlin.dsl.implementation
5+
import org.gradle.kotlin.dsl.kotlin
6+
import org.gradle.kotlin.dsl.`maven-publish`
7+
import org.gradle.kotlin.dsl.version
48

59
plugins {
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"
10+
kotlin("jvm") version embeddedKotlinVersion
11+
id("org.lwjgl.plugin") version "0.0.29"
12+
id("elect86.magik") version "0.3.1"
13+
`maven-publish`
1214
}
1315

1416
dependencies {
15-
subprojects.forEach(::implementation)
16-
}
17-
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")
22-
}
23-
24-
projects.core.dependencyProject.dependencies {
25-
implementation(kotlin("reflect"))
26-
implementation(unsigned, kool, glm, gli, gln)
27-
Lwjgl { implementation(glfw, jemalloc, opengl) }
28-
}
29-
projects.awt.dependencyProject.dependencies {
3017
implementation(projects.core)
31-
implementation(kool, glm, gln)
32-
Lwjgl { implementation(jawt, glfw, jemalloc, opengl) }
18+
implementation(projects.awt)
3319
}
34-
projects.vk.dependencyProject.dependencies {
35-
implementation(projects.core)
36-
implementation(kool, vkk)
37-
Lwjgl { implementation(glfw, jemalloc, opengl, vulkan) }
20+
21+
publishing {
22+
publications {
23+
createGithubPublication {
24+
from(components["java"])
25+
suppressAllPomMetadataWarnings()
26+
}
27+
}
28+
repositories {
29+
maven {
30+
name = "local"
31+
url = uri(layout.buildDirectory.file(name))
32+
}
33+
}
3834
}

‎core/core.gradle.kts‎

Lines changed: 31 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,41 @@
1-
import kx.*
2-
import org.lwjgl.Lwjgl
3-
import org.lwjgl.Lwjgl.Module.*
1+
import magik.createGithubPublication
2+
import org.lwjgl.lwjgl
3+
import org.lwjgl.lwjgl.Module.*
44

55
plugins {
6-
fun kx(vararg p: String) = p.forEach { id("io.github.kotlin-graphics.$it") }
7-
kx("align", "base", "publish", "utils")
6+
kotlin("jvm")
87
id("org.lwjgl.plugin")
8+
id("elect86.magik")
9+
`maven-publish`
910
}
1011

1112
version = rootProject.version
1213

1314
dependencies {
1415
implementation(kotlin("reflect"))
15-
implementation(unsigned, kool, glm, gli, gln)
16-
Lwjgl { implementation(glfw, jemalloc, opengl) }
16+
17+
implementation("kotlin.graphics:gln:0.5.31")
18+
implementation("kotlin.graphics:gli:0.8.3.0-18")
19+
implementation("kotlin.graphics:glm:0.9.9.1-5")
20+
implementation("kotlin.graphics:unsigned:3.3.31")
21+
implementation("kotlin.graphics:kool:0.9.68")
22+
lwjgl { implementation(glfw, jemalloc, opengl) }
23+
24+
testImplementation("io.kotest:kotest-runner-junit5:5.4.1")
25+
testImplementation("io.kotest:kotest-assertions-core:5.4.1")
1726
}
27+
28+
publishing {
29+
publications {
30+
createGithubPublication {
31+
from(components["java"])
32+
suppressAllPomMetadataWarnings()
33+
}
34+
}
35+
repositories {
36+
maven {
37+
name = "local"
38+
url = uri(layout.buildDirectory.file(name))
39+
}
40+
}
41+
}

‎core/src/main/kotlin/module-info.java‎ renamed to ‎core/src/main/kotlin/module-info‎

File renamed without changes.

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 3 additions & 3 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.3-bin.zip
4-
distributionSha256Sum=de8f52ad49bdc759164f72439a3bf56ddb1589c4cde802d3cec7d6ad0e0ee410
53
zipStoreBase=GRADLE_USER_HOME
6-
zipStorePath=wrapper/dists
4+
zipStorePath=wrapper/dists
5+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
6+
distributionSha256Sum=f6b8596b10cce501591e92f229816aa4046424f3b24d771751b06779d58c8ec4

‎settings.gradle.kts‎

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,18 @@
99
//}
1010

1111
pluginManagement {
12-
repositories {
13-
gradlePluginPortal()
14-
maven("https://raw.githubusercontent.com/kotlin-graphics/mary/master")
15-
}
12+
// repositories {
13+
// gradlePluginPortal()
14+
// maven("https://raw.githubusercontent.com/kotlin-graphics/mary/master")
15+
// }
1616
// includeBuild("../build-logic")
1717
// includeBuild("../magik")
1818
}
1919

20-
include("core", "awt", "vk")
20+
for (module in listOf("core", "awt"/*, "vk"*/)) {
21+
include(module)
22+
project(":$module").buildFileName = "$module.gradle.kts"
23+
}
2124

2225
rootProject.name = "uno"
2326

@@ -28,5 +31,12 @@ enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
2831

2932
gradle.rootProject {
3033
group = "kotlin.graphics"
31-
version = "0.7.10"
34+
version = "0.7.11"
35+
}
36+
37+
dependencyResolutionManagement {
38+
repositories {
39+
mavenCentral()
40+
maven("https://raw.githubusercontent.com/kotlin-graphics/mary/master")
41+
}
3242
}

‎vk/src/main/java/module-info.java‎ renamed to ‎vk/src/main/java/module-info‎

File renamed without changes.

0 commit comments

Comments
 (0)