@@ -3,27 +3,29 @@ import static org.gradle.internal.os.OperatingSystem.*
33buildscript {
44
55 ext{
6- kotlin_version = ' 1.3.10'
7- kotlintest_version = " 3.1.10"
6+ kotlin = ' org.jetbrains.kotlin:kotlin'
7+ kotlin_version = ' 1.3.11'
8+ kotlintest_version = " 3.1.11"
89 }
910
1011 repositories {
1112 jcenter() // shadow
1213 mavenCentral()
1314 maven { setUrl(" https://oss.sonatype.org/content/repositories/snapshots/" ) }
1415 }
16+
1517 dependencies {
16- classpath " org.jetbrains.kotlin: kotlin-gradle-plugin:$kotlin_version " . toString()
17- classpath ' com.github.jengelman.gradle.plugins:shadow:2 .0.4 '
18+ classpath " $ kotlin -gradle-plugin:$kotlin_version " . toString()
19+ classpath ' com.github.jengelman.gradle.plugins:shadow:4 .0.3 '
1820 classpath " org.junit.platform:junit-platform-gradle-plugin:1.2.0"
1921 }
2022}
2123
2224ext {
2325 moduleName = ' com.github.kotlin_graphics.glm'
24- unsigned_version = " 3538d42beb064972946c92fe839dc76e2a4d3ec2 "
25- kool_version = " a77c7291389c360f1b2a4939ed5b000ddccb8f27 "
26- lwjgl_version = " 3.2.1-SNAPSHOT "
26+ unsigned_version = " 6ba3af41713dba2d271043311ae947b8a41a42a3 "
27+ kool_version = " 8d4292e2e2091ab7dfab7bbb66c4775229168df7 "
28+ lwjgl_version = " 3.2.1"
2729 lwjgl_natives = current() == WINDOWS ? " windows" : current() == LINUX ? " linux" : " macos"
2830}
2931
@@ -76,34 +78,40 @@ project(":glm") {
7678
7779 dependencies {
7880
79- implementation " org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version " . toString()
80-
8181 api " com.github.kotlin-graphics:kotlin-unsigned:$unsigned_version " . toString()
8282 api " com.github.kotlin-graphics:kool:$kool_version " . toString()
8383
8484 testImplementation project(" :glm-test" )
8585
8686 testImplementation " io.kotlintest:kotlintest-runner-junit5:$kotlintest_version " . toString()
8787
88+ constraints {
89+ testImplementation(" org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version " )
90+ testImplementation(" org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version " )
91+ testImplementation(" org.jetbrains.kotlin:kotlin-reflect:$kotlin_version " )
92+ }
93+
8894 [" " , " -glfw" , " -jemalloc" , " -openal" , " -opengl" , " -stb" ]. each {
8995 implementation " org.lwjgl:lwjgl$it :$lwjgl_version "
9096 implementation " org.lwjgl:lwjgl$it :$lwjgl_version :natives-$lwjgl_natives "
9197 }
9298 }
9399
94- test {
95- useJUnitPlatform()
96- }
100+ test. useJUnitPlatform()
97101}
98102
99103project(" :glm-test" ) {
100104
101105 dependencies {
102106 implementation project(" :glm" )
103107
104- implementation " org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version " . toString()
105-
106108 implementation " io.kotlintest:kotlintest-core:$kotlintest_version " . toString()
107109 implementation " io.kotlintest:kotlintest-assertions:$kotlintest_version " . toString()
110+
111+ constraints {
112+ implementation(" org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version " )
113+ implementation(" org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version " )
114+ implementation(" org.jetbrains.kotlin:kotlin-reflect:$kotlin_version " )
115+ }
108116 }
109117}
0 commit comments