Merge remote-tracking branch 'origin/master'

# Conflicts:
#	build.gradle

Author: elect86

.idea/modules.xml

@@ -1,46 +1,26 @@
-apply plugin: 'maven'
-apply plugin: 'kotlin'
-
-apply plugin: 'com.github.johnrengelman.shadow'
-
-ext.moduleName = 'com.github.kotlin_graphics.kotlin_unsigned'
-
-buildscript {
-
-    ext.kotlinVersion = '1.3.11'
+plugins {
+    id 'maven'
+    id "org.jetbrains.kotlin.jvm" version "1.3.10"
+    id "com.github.johnrengelman.shadow" version '2.0.4'
+}
 
-    repositories {
-        jcenter()   // shadow
-        mavenCentral()
-        maven { url = "https://dl.bintray.com/kotlin/kotlin-eap" }
-    }
-    dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion".toString()
-        classpath 'com.github.jengelman.gradle.plugins:shadow:2.0.4'
-        classpath "org.junit.platform:junit-platform-gradle-plugin:1.2.0"
-    }
+ext{
+    moduleName = 'com.github.kotlin_graphics.kotlin_unsigned'
+    kotlintest_version = '3.1.10'
 }
 
 dependencies {
 
-    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion".toString()
+    implementation "org.jetbrains.kotlin:kotlin-stdlib"
 
-    testImplementation 'io.kotlintest:kotlintest-runner-junit5:3.1.11'
+    testImplementation "io.kotlintest:kotlintest-runner-junit5:$kotlintest_version".toString()
 }
 
 repositories {
     mavenCentral()
-    maven { url = "https://dl.bintray.com/kotlin/kotlin-eap" }
     maven { url = "https://jitpack.io" }
 }
 
-
-allprojects {
-    sourceCompatibility = 1.7
-    targetCompatibility = 1.7
-}
-
-
 task sourcesJar(type: Jar, dependsOn: classes) {
     classifier = 'sources'
     from sourceSets.main.allSource
@@ -59,4 +39,8 @@ artifacts {
 jar {
     inputs.property("moduleName", moduleName)
     manifest.attributes('Automatic-Module-Name': moduleName)
+}
+
+test {
+    useJUnitPlatform()
 }

.idea/modules/kotlin-unsigned.iml

@@ -1,6 +1,6 @@
-#Sun Dec 17 10:10:22 CET 2017
+#Tue Nov 27 10:15:46 CET 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.0-all.zip

build.gradle

@@ -28,7 +28,7 @@ APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+DEFAULT_JVM_OPTS='"-Xmx64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"

gradle/wrapper/gradle-wrapper.jar

@@ -14,7 +14,7 @@ set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
+set DEFAULT_JVM_OPTS="-Xmx64m"
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome

gradle/wrapper/gradle-wrapper.properties

@@ -96,4 +96,6 @@ class Ubyte(var v: Byte) : Number() {
     operator fun compareTo(b: Int) = toInt() compareUnsigned b
 
     override fun toString() = toInt().toString()
+
+    override fun equals(other: Any?) = other is Ubyte && v == other.v
 }

gradlew

@@ -79,5 +79,6 @@ data class Uint(var v: Int = 0) : Number() {
 
     override fun toString() = toLong().toString()
 
+    override fun equals(other: Any?) = other is Uint && v == other.v
     // TODO long?
 }

gradlew.bat

@@ -74,6 +74,7 @@ data class Ulong(var v: Long = 0) : Number(), Comparable<Ulong> {
     // TODO others
 
     override fun toString() = toBigInt().toString()
+    override fun equals(other: Any?) = other is Ulong && v == other.v
 
     operator fun rangeTo(b: Ulong) = UlongRange(this, b)
 

src/main/kotlin/unsigned/Ubyte.kt

@@ -93,4 +93,5 @@ data class Ushort(var v: Short = 0) : Number() {
     operator fun compareTo(b: Int) = toInt() compareUnsigned b
 
     override fun toString() = toInt().toString()
+    override fun equals(other: Any?) = other is Ushort && v == other.v
 }