- Kotlin -> 1.6.10

- Dokka  -> 1.6.0
- Cleanup repositories

Author: pusolito

build.gradle.kts

@@ -2,7 +2,6 @@ buildscript {
     val kotlinVersion: String by System.getProperties()
 
     repositories {
-        maven       { url = uri("https://dl.bintray.com/kotlin/kotlin-eap") }
         mavenCentral()
     }
 
@@ -15,15 +14,13 @@ plugins {
     val kotlinVersion: String by System.getProperties()
 
     id ("org.jetbrains.kotlin.multiplatform") version kotlinVersion
-    id ("org.jetbrains.dokka"               ) version "0.10.0"
-    id("maven-publish")
+    id ("org.jetbrains.dokka"               ) version "1.6.0"
+    id ("maven-publish"                     )
     signing
 }
 
 repositories {
-    maven       { url = uri("https://dl.bintray.com/kotlin/kotlin-eap") }
     mavenCentral()
-    jcenter     ()
 }
 
 kotlin {
@@ -85,7 +82,7 @@ val dokkaJar by tasks.creating(Jar::class) {
     group = JavaBasePlugin.DOCUMENTATION_GROUP
     description = "Assembles Kotlin docs with Dokka"
     classifier = "javadoc"
-    from(tasks.dokka)
+    from(tasks.dokkaHtml)
 }
 
 publishing {
@@ -144,14 +141,30 @@ signing {
     sign(publishing.publications)
 }
 
-tasks {
-    val dokka by getting(org.jetbrains.dokka.gradle.DokkaTask::class) {
-        outputDirectory = "$buildDir/javadoc"
-        outputFormat    = "html"
+tasks.dokkaHtml {
+    outputDirectory.set(buildDir.resolve("javadoc"))
 
-        multiplatform {
-            val js  by creating {}
-            val jvm by creating {}
+    dokkaSourceSets {
+        configureEach {
+            includeNonPublic.set(false)
+
+            // Do not output deprecated members. Applies globally, can be overridden by packageOptions
+            skipDeprecated.set(true)
+
+            // Emit warnings about not documented members. Applies globally, also can be overridden by packageOptions
+            reportUndocumented.set(true)
+
+            // Do not create index pages for empty packages
+            skipEmptyPackages.set(true)
         }
     }
+}
+
+rootProject.plugins.withType<org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin> {
+    rootProject.the<org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension>().download    = false
+    rootProject.the<org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension>().nodeVersion = "16.0.0"
+}
+
+rootProject.plugins.withType<org.jetbrains.kotlin.gradle.targets.js.yarn.YarnPlugin> {
+    rootProject.the<org.jetbrains.kotlin.gradle.targets.js.yarn.YarnRootExtension>().disableGranularWorkspaces()
 }

gradle.properties

@@ -1,6 +1,6 @@
-systemProp.kotlinVersion = 1.5.21
+systemProp.kotlinVersion = 1.6.10
 
-version            = 0.3.2
+version            = 0.3.1
 group              = io.nacular.measured
 
 junitVersion       = 4.12

src/commonMain/kotlin/io/nacular/measured/units/Angle.kt

@@ -2,6 +2,7 @@
 
 package io.nacular.measured.units
 
+import io.nacular.measured.units.Angle.Companion.degrees
 import kotlin.math.PI
 
 /**
@@ -34,14 +35,14 @@ open class Angle(suffix: String, ratio: Double = 1.0): Units(suffix, ratio) {
 }
 
 /**
- * @returns a measure that is within [0°, 360°)
+ * Returns a measure that is within [0°, 360°)
  */
 fun Measure<Angle>.normalize(): Measure<Angle> {
-    var result = (this `in` Angle.degrees) % 360
+    var result = (this `in` degrees) % 360
 
     if (result < 0) {
         result += 360
     }
 
-    return result * Angle.degrees
+    return result * degrees
 }

src/commonMain/kotlin/io/nacular/measured/units/Units.kt

@@ -98,7 +98,7 @@ class Measure<T: Units>(val amount: Double, val units: T): Comparable<Measure<T>
      * Type must share parent
      * (eg Mile into Kilometer, because they both are made from Distance)
      */
-    infix fun <A: T> `as`(other: A): Measure<out T> = if (units == other) this else Measure(this `in` other, other)
+    infix fun <A: T> `as`(other: A): Measure<T> = if (units == other) this else Measure(this `in` other, other)
 
     infix fun <A: T> `in`(other: A): Double = if (units == other) amount else  amount * (units.ratio / other.ratio)