Skip to content

Commit 7dcdec5

Browse files
elect86elect86
committed
⬆️
Kotlin 1.2.40 Gradle 4.7 KotlinTest 3.0.4 Shadow Plugin 2.0.3
1 parent e5e8762 commit 7dcdec5

29 files changed

+33
-32
lines changed

‎build.gradle

+5-4
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ apply plugin: 'com.github.johnrengelman.shadow'
99

1010
buildscript {
1111

12-
ext.kotlinVersion = '1.2.40-eap-51'
12+
ext.kotlinVersion = '1.2.40'
1313

1414
repositories {
1515
jcenter() // shadow
@@ -18,17 +18,18 @@ buildscript {
1818
}
1919
dependencies {
2020
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
21-
classpath 'com.github.jengelman.gradle.plugins:shadow:2.0.2'
21+
classpath 'com.github.jengelman.gradle.plugins:shadow:2.0.3'
22+
classpath "org.junit.platform:junit-platform-gradle-plugin:1.1.0"
2223
}
2324
}
2425

2526
dependencies {
2627

2728
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
2829

29-
compile 'com.github.kotlin-graphics:kotlin-unsigned:ede17d36d5c46501382ac061e414048053dcfa89'
30+
compile 'com.github.kotlin-graphics:kotlin-unsigned:d6848a4c60bb6b98dfbd2906bab04e7430bfd3fc'
3031

31-
testCompile 'io.kotlintest:kotlintest:2.0.7'
32+
testCompile 'io.kotlintest:kotlintest-runner-junit5:3.0.4'
3233
}
3334

3435
repositories {

‎gradle/wrapper/gradle-wrapper.properties

+1-1
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-4.6-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.7-all.zip

‎src/test/kotlin/glm_/gtx/testGtxExteriorProduct.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package glm_.gtx
22

33
import glm_.glm
44
import glm_.vec2.Vec2
5-
import io.kotlintest.matchers.shouldBe
5+
import io.kotlintest.shouldBe
66
import io.kotlintest.specs.StringSpec
77

88
class testGtxExteriorProduct : StringSpec() {

‎src/test/kotlin/glm_/gtx/testGtxFastTrigonometry.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import glm_.vec1.operators.minus
1818
import glm_.vec4.Vec4
1919
import glm_.vec4.operators.minus
2020
import glm_.vec4.operators.times
21-
import io.kotlintest.matchers.shouldBe
21+
import io.kotlintest.shouldBe
2222
import io.kotlintest.specs.StringSpec
2323
import kotlin.system.measureNanoTime
2424

‎src/test/kotlin/glm_/gtx/testGtxInteger.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import glm_.d
44
import glm_.glm
55
import glm_.i
66
import glm_.msb
7-
import io.kotlintest.matchers.shouldBe
7+
import io.kotlintest.shouldBe
88
import io.kotlintest.specs.StringSpec
99

1010
class testGtxInteger : StringSpec() {

‎src/test/kotlin/glm_/gtx/testGtxIntersect.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import glm_.glm
44
import glm_.glm.epsilonF
55
import glm_.vec2.Vec2
66
import glm_.vec3.Vec3
7-
import io.kotlintest.matchers.shouldBe
7+
import io.kotlintest.shouldBe
88
import io.kotlintest.specs.StringSpec
99

1010
class testGtxIntersect : StringSpec() {

‎src/test/kotlin/glm_/gtx/testGtxTexture.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package glm_.gtx
22

33
import glm_.glm
44
import glm_.vec2.Vec2i
5-
import io.kotlintest.matchers.shouldBe
5+
import io.kotlintest.shouldBe
66
import io.kotlintest.specs.StringSpec
77

88
class testGtxTexture : StringSpec() {

‎src/test/kotlin/glm_/gtx/testGtxVectorAngle.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import glm_.glm
44
import glm_.vec2.Vec2
55
import glm_.vec3.Vec3
66
import glm_.vec4.Vec4
7-
import io.kotlintest.matchers.shouldBe
7+
import io.kotlintest.shouldBe
88
import io.kotlintest.specs.StringSpec
99

1010
class testGtxVectorAngle : StringSpec() {

‎src/test/kotlin/glm_/testBitfield.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import glm_.vec2.Vec2b
55
import glm_.vec2.Vec2s
66
import glm_.vec4.Vec4b
77
import glm_.vec4.Vec4i
8-
import io.kotlintest.matchers.shouldBe
8+
import io.kotlintest.shouldBe
99
import io.kotlintest.specs.StringSpec
1010
import unsigned.toUInt
1111
import unsigned.toULong

‎src/test/kotlin/glm_/testClosestPointToLines.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package glm_
22

33
import glm_.vec3.Vec3
4-
import io.kotlintest.matchers.shouldBe
4+
import io.kotlintest.shouldBe
55
import io.kotlintest.specs.StringSpec
66

77
class testClosestPointToLines : StringSpec() {

‎src/test/kotlin/glm_/testColorSpace.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package glm_
33
import glm_.vec2.Vec2
44
import glm_.vec3.Vec3
55
import glm_.vec4.Vec4
6-
import io.kotlintest.matchers.shouldBe
6+
import io.kotlintest.shouldBe
77
import io.kotlintest.specs.StringSpec
88

99
class testColorSpace : StringSpec() {

‎src/test/kotlin/glm_/testCoreFunCommon.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import glm_.vec4.Vec4
1616
import glm_.vec4.Vec4bool
1717
import glm_.vec4.Vec4d
1818
import glm_.vec4.Vec4i
19-
import io.kotlintest.matchers.shouldBe
19+
import io.kotlintest.shouldBe
2020
import io.kotlintest.specs.StringSpec
2121

2222
/**

‎src/test/kotlin/glm_/testCoreFuncExponential.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import glm_.vec1.Vec1
55
import glm_.vec2.Vec2
66
import glm_.vec3.Vec3
77
import glm_.vec4.Vec4
8-
import io.kotlintest.matchers.shouldBe
8+
import io.kotlintest.shouldBe
99
import io.kotlintest.specs.StringSpec
1010

1111
class testCoreFuncExponential : StringSpec() {

‎src/test/kotlin/glm_/testCoreFuncGeometric.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import glm_.vec2.Vec2
55
import glm_.vec2.Vec2d
66
import glm_.vec3.Vec3
77
import glm_.vec4.Vec4
8-
import io.kotlintest.matchers.shouldBe
8+
import io.kotlintest.shouldBe
99
import io.kotlintest.specs.StringSpec
1010

1111
class testCoreFuncGeometric : StringSpec() {

‎src/test/kotlin/glm_/testCoreFuncInteger.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package glm_
22

33
import glm_.Result.FAIL
44
import glm_.Result.SUCCESS
5-
import io.kotlintest.matchers.shouldBe
5+
import io.kotlintest.shouldBe
66
import io.kotlintest.specs.StringSpec
77
import unsigned.toULong
88

‎src/test/kotlin/glm_/testCoreFuncMatrix.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import glm_.mat4x4.Mat4
77
import glm_.vec2.Vec2
88
import glm_.vec3.Vec3
99
import glm_.vec4.Vec4
10-
import io.kotlintest.matchers.shouldBe
10+
import io.kotlintest.shouldBe
1111
import io.kotlintest.specs.StringSpec
1212

1313
/**

‎src/test/kotlin/glm_/testCoreMat2.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package glm_
33
import glm_.mat2x2.Mat2
44
import glm_.mat2x2.operators.times
55
import glm_.vec2.Vec2
6-
import io.kotlintest.matchers.shouldBe
6+
import io.kotlintest.shouldBe
77
import io.kotlintest.specs.StringSpec
88

99
/**

‎src/test/kotlin/glm_/testCoreMat3.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package glm_
33
import glm_.mat3x3.Mat3
44
import glm_.mat3x3.operators.times
55
import glm_.vec3.Vec3
6-
import io.kotlintest.matchers.shouldBe
6+
import io.kotlintest.shouldBe
77
import io.kotlintest.specs.StringSpec
88

99
/**

‎src/test/kotlin/glm_/testCoreMat4.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import glm_.mat4x4.Mat4d
55
import glm_.mat4x4.operators.times
66
import glm_.vec4.Vec4
77
import glm_.vec4.Vec4d
8-
import io.kotlintest.matchers.shouldBe
8+
import io.kotlintest.shouldBe
99
import io.kotlintest.specs.StringSpec
1010

1111
/**

‎src/test/kotlin/glm_/testCoreMatrixTransform.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package glm_
22

33
import glm_.mat4x4.Mat4
4-
import io.kotlintest.matchers.shouldBe
4+
import io.kotlintest.shouldBe
55
import io.kotlintest.specs.StringSpec
66

77
/**

‎src/test/kotlin/glm_/testCorePure.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import glm_.vec4.operators.div
1010
import glm_.vec4.operators.minus
1111
import glm_.vec4.operators.plus
1212
import glm_.vec4.operators.times
13-
import io.kotlintest.matchers.shouldBe
13+
import io.kotlintest.shouldBe
1414
import io.kotlintest.specs.StringSpec
1515

1616
class testCorePure : StringSpec() {

‎src/test/kotlin/glm_/testCoreVec2.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import glm_.vec2.operators.minus
1212
import glm_.vec2.operators.plus
1313
import glm_.vec2.operators.times
1414
import glm_.vec3.Vec3
15-
import io.kotlintest.matchers.shouldBe
15+
import io.kotlintest.shouldBe
1616
import io.kotlintest.specs.StringSpec
1717

1818

‎src/test/kotlin/glm_/testCoreVec2i.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package glm_
22

33
import glm_.vec2.Vec2bool
44
import glm_.vec2.Vec2i
5-
import io.kotlintest.matchers.shouldBe
5+
import io.kotlintest.shouldBe
66
import io.kotlintest.specs.StringSpec
77

88
/**

‎src/test/kotlin/glm_/testMatrixInterpolation.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package glm_
33
import glm_.mat4x4.Mat4
44
import glm_.quat.Quat
55
import glm_.vec3.Vec3
6-
import io.kotlintest.matchers.shouldBe
6+
import io.kotlintest.shouldBe
77
import io.kotlintest.specs.StringSpec
88

99
class matInterpolation : StringSpec() {

‎src/test/kotlin/glm_/testNoise.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package glm_
33
import glm_.vec2.Vec2
44
import glm_.vec3.Vec3
55
import glm_.vec4.Vec4
6-
import io.kotlintest.matchers.shouldBe
6+
import io.kotlintest.shouldBe
77
import io.kotlintest.specs.StringSpec
88

99
class testNoise : StringSpec() {

‎src/test/kotlin/glm_/testPacking.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import glm_.vec2.Vec2
55
import glm_.vec3.Vec3
66
import glm_.vec4.Vec4
77
import glm_.vec4.Vec4i
8-
import io.kotlintest.matchers.shouldBe
8+
import io.kotlintest.shouldBe
99
import io.kotlintest.specs.StringSpec
1010

1111
class testPacking : StringSpec() {

‎src/test/kotlin/glm_/testQuaternion.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import glm_.mat4x4.Mat4
44
import glm_.quat.Quat
55
import glm_.quat.times
66
import glm_.vec3.Vec3
7-
import io.kotlintest.matchers.shouldBe
7+
import io.kotlintest.shouldBe
88
import io.kotlintest.specs.StringSpec
99

1010
/**

‎src/test/kotlin/glm_/testRound.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package glm_
22

3-
import io.kotlintest.matchers.shouldBe
3+
import io.kotlintest.shouldBe
44
import io.kotlintest.specs.StringSpec
55

66
/**

‎src/test/kotlin/glm_/typeHalf_.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package glm_
22

33
import glm_.vec2.Vec2
4-
import io.kotlintest.matchers.shouldBe
4+
import io.kotlintest.shouldBe
55
import io.kotlintest.specs.StringSpec
66

77
class typeHalf_ : StringSpec() {

0 commit comments

Comments
 (0)