From 76c9a303691c51f8ad7478054444e9b057e10b97 Mon Sep 17 00:00:00 2001
From: Michael Olmsted <molmsted98@gmail.com>
Date: Mon, 7 Dec 2020 19:00:16 -0500
Subject: [PATCH 01/39] Update to Kotlin 1.4.21

---
 buildSrc/src/main/kotlin/deps/deps.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buildSrc/src/main/kotlin/deps/deps.kt b/buildSrc/src/main/kotlin/deps/deps.kt
index b92676f..09a81c9 100644
--- a/buildSrc/src/main/kotlin/deps/deps.kt
+++ b/buildSrc/src/main/kotlin/deps/deps.kt
@@ -6,7 +6,7 @@ object Dokka : Group("org.jetbrains.dokka", "0.10.1") {
     }
 }
 
-object Kotlin : Group("org.jetbrains.kotlin", "1.3.72") {
+object Kotlin : Group("org.jetbrains.kotlin", "1.4.21") {
     val StdLib = artifact("kotlin-stdlib")
 
     object Gradle {

From e9a0c17261cfaf21e36da0ff15feb537cd49e25e Mon Sep 17 00:00:00 2001
From: Michael Olmsted <molmsted98@gmail.com>
Date: Thu, 6 May 2021 17:23:50 -0400
Subject: [PATCH 02/39] Update to Kotlin 1.4.23

---
 buildSrc/src/main/kotlin/deps/deps.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buildSrc/src/main/kotlin/deps/deps.kt b/buildSrc/src/main/kotlin/deps/deps.kt
index 09a81c9..b2d381a 100644
--- a/buildSrc/src/main/kotlin/deps/deps.kt
+++ b/buildSrc/src/main/kotlin/deps/deps.kt
@@ -6,7 +6,7 @@ object Dokka : Group("org.jetbrains.dokka", "0.10.1") {
     }
 }
 
-object Kotlin : Group("org.jetbrains.kotlin", "1.4.21") {
+object Kotlin : Group("org.jetbrains.kotlin", "1.4.32") {
     val StdLib = artifact("kotlin-stdlib")
 
     object Gradle {

From 90659dd3b6a448f15900e0f460a905d9962aabfc Mon Sep 17 00:00:00 2001
From: Michael Olmsted <molmsted98@gmail.com>
Date: Tue, 1 Jun 2021 19:59:37 -0400
Subject: [PATCH 03/39] Remove POM publishing

---
 gradle.properties                 | 13 ------
 gradle/gradle-mvn-mpp-push.gradle | 71 -------------------------------
 matcher/build.gradle.kts          |  6 ---
 matcher/gradle.properties         |  2 -
 navigator/build.gradle.kts        |  6 ---
 navigator/gradle.properties       |  2 -
 router/build.gradle.kts           |  6 ---
 router/gradle.properties          |  2 -
 uri/build.gradle.kts              |  6 ---
 uri/gradle.properties             |  2 -
 10 files changed, 116 deletions(-)
 delete mode 100644 matcher/gradle.properties
 delete mode 100644 navigator/gradle.properties
 delete mode 100644 router/gradle.properties
 delete mode 100644 uri/gradle.properties

diff --git a/gradle.properties b/gradle.properties
index 06ea60d..61cccfd 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,14 +1 @@
-GROUP=com.michaelpardo.max
-VERSION_NAME=0.1.0-SNAPSHOT
-POM_DESCRIPTION=Max
-POM_URL=https://github.com/pardom/max/
-POM_SCM_URL=https://github.com/pardom/max/
-POM_SCM_CONNECTION=scm:git:git://github.com/pardom/max.git
-POM_SCM_DEV_CONNECTION=scm:git:ssh://git@github.com/pardom/max.git
-POM_LICENCE_NAME=The Apache Software License, Version 2.0
-POM_LICENCE_URL=http://www.apache.org/licenses/LICENSE-2.0.txt
-POM_LICENCE_DIST=repo
-POM_DEVELOPER_ID=michaelpardo
-POM_DEVELOPER_NAME=Michael Pardo
-
 kotlin.native.ignoreDisabledTargets=true
diff --git a/gradle/gradle-mvn-mpp-push.gradle b/gradle/gradle-mvn-mpp-push.gradle
index 6ae3f12..5a3bffc 100644
--- a/gradle/gradle-mvn-mpp-push.gradle
+++ b/gradle/gradle-mvn-mpp-push.gradle
@@ -18,28 +18,6 @@ dokka {
     }
 }
 
-def isReleaseBuild() {
-    return VERSION_NAME.contains("SNAPSHOT") == false
-}
-
-def getReleaseRepositoryUrl() {
-    return hasProperty('RELEASE_REPOSITORY_URL') ? RELEASE_REPOSITORY_URL :
-            "https://oss.sonatype.org/service/local/staging/deploy/maven2/"
-}
-
-def getSnapshotRepositoryUrl() {
-    return hasProperty('SNAPSHOT_REPOSITORY_URL') ? SNAPSHOT_REPOSITORY_URL :
-            "https://oss.sonatype.org/content/repositories/snapshots/"
-}
-
-def getRepositoryUsername() {
-    return hasProperty('SONATYPE_NEXUS_USERNAME') ? SONATYPE_NEXUS_USERNAME : ""
-}
-
-def getRepositoryPassword() {
-    return hasProperty('SONATYPE_NEXUS_PASSWORD') ? SONATYPE_NEXUS_PASSWORD : ""
-}
-
 task emptySourcesJar(type: Jar) {
     classifier = 'sources'
 }
@@ -49,44 +27,9 @@ task javadocsJar(type: Jar, dependsOn: dokka) {
     from dokka.outputDirectory
 }
 
-signing {
-    required { isReleaseBuild() && gradle.taskGraph.hasTask("uploadArchives") }
-    sign(publishing.publications)
-}
-
 publishing {
     publications.all {
         artifact javadocsJar
-
-        pom.withXml {
-            def root = asNode()
-
-            root.children().last() + {
-                resolveStrategy = Closure.DELEGATE_FIRST
-
-                description POM_DESCRIPTION
-                name POM_NAME
-                url POM_URL
-                licenses {
-                    license {
-                        name POM_LICENCE_NAME
-                        url POM_LICENCE_URL
-                        distribution POM_LICENCE_DIST
-                    }
-                }
-                scm {
-                    url POM_SCM_URL
-                    connection POM_SCM_CONNECTION
-                    developerConnection POM_SCM_DEV_CONNECTION
-                }
-                developers {
-                    developer {
-                        id POM_DEVELOPER_ID
-                        name POM_DEVELOPER_NAME
-                    }
-                }
-            }
-        }
     }
 
     afterEvaluate {
@@ -95,18 +38,4 @@ publishing {
             artifact emptySourcesJar
         }
     }
-
-    repositories {
-        maven {
-            url isReleaseBuild() ? getReleaseRepositoryUrl() : getSnapshotRepositoryUrl()
-            credentials {
-                username getRepositoryUsername()
-                password getRepositoryPassword()
-            }
-        }
-        maven {
-            name 'test'
-            url "file://${rootProject.buildDir}/localMaven"
-        }
-    }
 }
diff --git a/matcher/build.gradle.kts b/matcher/build.gradle.kts
index 024f987..bb77e69 100755
--- a/matcher/build.gradle.kts
+++ b/matcher/build.gradle.kts
@@ -1,11 +1,5 @@
 import org.jetbrains.kotlin.gradle.plugin.mpp.AbstractKotlinNativeTargetPreset
 
-val GROUP: String by project
-val VERSION_NAME: String by project
-
-group = GROUP
-version = VERSION_NAME
-
 plugins {
     kotlin("multiplatform")
 }
diff --git a/matcher/gradle.properties b/matcher/gradle.properties
deleted file mode 100644
index 5582e85..0000000
--- a/matcher/gradle.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-POM_ARTIFACT_ID=max-matcher
-POM_NAME=Max Matcher
diff --git a/navigator/build.gradle.kts b/navigator/build.gradle.kts
index 1802d0e..2ad3c6f 100755
--- a/navigator/build.gradle.kts
+++ b/navigator/build.gradle.kts
@@ -1,11 +1,5 @@
 import org.jetbrains.kotlin.gradle.plugin.mpp.AbstractKotlinNativeTargetPreset
 
-val GROUP: String by project
-val VERSION_NAME: String by project
-
-group = GROUP
-version = VERSION_NAME
-
 plugins {
     kotlin("multiplatform")
 }
diff --git a/navigator/gradle.properties b/navigator/gradle.properties
deleted file mode 100644
index 688d3c0..0000000
--- a/navigator/gradle.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-POM_ARTIFACT_ID=max-navigator
-POM_NAME=Max Navigator
diff --git a/router/build.gradle.kts b/router/build.gradle.kts
index 4032776..313b6de 100755
--- a/router/build.gradle.kts
+++ b/router/build.gradle.kts
@@ -1,11 +1,5 @@
 import org.jetbrains.kotlin.gradle.plugin.mpp.AbstractKotlinNativeTargetPreset
 
-val GROUP: String by project
-val VERSION_NAME: String by project
-
-group = GROUP
-version = VERSION_NAME
-
 plugins {
     kotlin("multiplatform")
 }
diff --git a/router/gradle.properties b/router/gradle.properties
deleted file mode 100644
index 5432472..0000000
--- a/router/gradle.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-POM_ARTIFACT_ID=max-router
-POM_NAME=Max Router
diff --git a/uri/build.gradle.kts b/uri/build.gradle.kts
index 024f987..bb77e69 100755
--- a/uri/build.gradle.kts
+++ b/uri/build.gradle.kts
@@ -1,11 +1,5 @@
 import org.jetbrains.kotlin.gradle.plugin.mpp.AbstractKotlinNativeTargetPreset
 
-val GROUP: String by project
-val VERSION_NAME: String by project
-
-group = GROUP
-version = VERSION_NAME
-
 plugins {
     kotlin("multiplatform")
 }
diff --git a/uri/gradle.properties b/uri/gradle.properties
deleted file mode 100644
index 731bbcd..0000000
--- a/uri/gradle.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-POM_ARTIFACT_ID=max-uri
-POM_NAME=Max URI

From d6dcde49878079df5bbd1ef6709518c8bac778be Mon Sep 17 00:00:00 2001
From: Michael Olmsted <molmsted98@gmail.com>
Date: Tue, 1 Jun 2021 20:13:19 -0400
Subject: [PATCH 04/39] Remove jcenter repository

---
 build.gradle.kts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index f837fa1..d68e5f2 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,6 +1,7 @@
 buildscript {
     repositories {
-        jcenter()
+        google()
+        mavenCentral()
     }
     dependencies {
         classpath(deps.Kotlin.Gradle.Plugin)

From 395b21f50d8bd3eb5f8365307092b44471151601 Mon Sep 17 00:00:00 2001
From: Michael Olmsted <molmsted98@gmail.com>
Date: Tue, 1 Jun 2021 20:24:52 -0400
Subject: [PATCH 05/39] Handle publishing jar without classifier

---
 gradle/gradle-mvn-mpp-push.gradle | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/gradle/gradle-mvn-mpp-push.gradle b/gradle/gradle-mvn-mpp-push.gradle
index 5a3bffc..a66c6df 100644
--- a/gradle/gradle-mvn-mpp-push.gradle
+++ b/gradle/gradle-mvn-mpp-push.gradle
@@ -19,11 +19,10 @@ dokka {
 }
 
 task emptySourcesJar(type: Jar) {
-    classifier = 'sources'
+    archiveAppendix.set("empty")
 }
 
 task javadocsJar(type: Jar, dependsOn: dokka) {
-    classifier = 'javadoc'
     from dokka.outputDirectory
 }
 
@@ -35,7 +34,7 @@ publishing {
     afterEvaluate {
         publications.getByName('kotlinMultiplatform') {
             // Source jars are only created for platforms, not the common artifact.
-            artifact emptySourcesJar
+            artifact(emptySourcesJar) { classifier 'javadoc' }
         }
     }
 }

From d43f8fb1608d69ad178df7c784a12a072f8149b0 Mon Sep 17 00:00:00 2001
From: Michael Olmsted <molmsted98@gmail.com>
Date: Tue, 1 Jun 2021 20:31:51 -0400
Subject: [PATCH 06/39] Apply jar publishing change to jvm

---
 gradle/gradle-mvn-mpp-push.gradle | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/gradle/gradle-mvn-mpp-push.gradle b/gradle/gradle-mvn-mpp-push.gradle
index a66c6df..a9a6216 100644
--- a/gradle/gradle-mvn-mpp-push.gradle
+++ b/gradle/gradle-mvn-mpp-push.gradle
@@ -33,7 +33,10 @@ publishing {
 
     afterEvaluate {
         publications.getByName('kotlinMultiplatform') {
-            // Source jars are only created for platforms, not the common artifact.
+            artifact(emptySourcesJar) { classifier 'javadoc' }
+        }
+
+        publications.getByName('jvm') {
             artifact(emptySourcesJar) { classifier 'javadoc' }
         }
     }

From 8c3d5fff64373382599221e55a765e3e396f542b Mon Sep 17 00:00:00 2001
From: Michael Olmsted <molmsted98@gmail.com>
Date: Tue, 1 Jun 2021 20:41:03 -0400
Subject: [PATCH 07/39] Select proper artifact id for publishing

---
 gradle/gradle-mvn-mpp-push.gradle | 36 +++++++++++++++++++++++++------
 1 file changed, 29 insertions(+), 7 deletions(-)

diff --git a/gradle/gradle-mvn-mpp-push.gradle b/gradle/gradle-mvn-mpp-push.gradle
index a9a6216..acbca0d 100644
--- a/gradle/gradle-mvn-mpp-push.gradle
+++ b/gradle/gradle-mvn-mpp-push.gradle
@@ -26,18 +26,40 @@ task javadocsJar(type: Jar, dependsOn: dokka) {
     from dokka.outputDirectory
 }
 
+def selectArtifactId(project, type, defaultName) {
+    def name = project.name
+    def isCommon = project.ext.has("commonStructure")
+    def commonIsRoot = project.ext.has("commonStructure") && project.ext.commonStructure
+    def hasNative = project.ext.has("hasNative") && project.ext.hasNative
+    switch (type) {
+        case 'metadata':
+            if (!isCommon) return "$name-$type"
+            return "$name-metadata"
+            break
+        case 'kotlinMultiplatform':
+            if (!hasNative) return "$name-kotlinMultiplatform"
+            return name
+            break
+        case 'jvm':
+            return commonIsRoot ? "$name-jvm" : "$name"
+            break
+        default:
+            return isCommon || hasNative ? defaultName : "$name"
+            break
+    }
+}
+
 publishing {
     publications.all {
         artifact javadocsJar
-    }
 
-    afterEvaluate {
-        publications.getByName('kotlinMultiplatform') {
-            artifact(emptySourcesJar) { classifier 'javadoc' }
-        }
+        def type = it.name
+        def id = selectArtifactId(project, type, it.artifactId)
+        it.artifactId = id
 
-        publications.getByName('jvm') {
-            artifact(emptySourcesJar) { classifier 'javadoc' }
+        if (name == "kotlinMultiplatform") {
+            it.artifact(emptyJar) { classifier 'javadoc' }
+            it.artifact(emptyJar) { classifier 'kdoc' }
         }
     }
 }

From a8f09e457535498d9641ea61feaebf00a30b1997 Mon Sep 17 00:00:00 2001
From: Michael Olmsted <molmsted98@gmail.com>
Date: Tue, 1 Jun 2021 20:46:23 -0400
Subject: [PATCH 08/39] Correct typo in task name

---
 gradle/gradle-mvn-mpp-push.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/gradle-mvn-mpp-push.gradle b/gradle/gradle-mvn-mpp-push.gradle
index acbca0d..2c79a82 100644
--- a/gradle/gradle-mvn-mpp-push.gradle
+++ b/gradle/gradle-mvn-mpp-push.gradle
@@ -18,7 +18,7 @@ dokka {
     }
 }
 
-task emptySourcesJar(type: Jar) {
+task emptyJar(type: Jar) {
     archiveAppendix.set("empty")
 }
 

From cdd81a795bbb789ee554c0a86c421888240c5126 Mon Sep 17 00:00:00 2001
From: Michael Olmsted <molmsted98@gmail.com>
Date: Tue, 1 Jun 2021 20:59:01 -0400
Subject: [PATCH 09/39] Publish sources jar

---
 gradle/gradle-mvn-mpp-push.gradle | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gradle/gradle-mvn-mpp-push.gradle b/gradle/gradle-mvn-mpp-push.gradle
index 2c79a82..879c403 100644
--- a/gradle/gradle-mvn-mpp-push.gradle
+++ b/gradle/gradle-mvn-mpp-push.gradle
@@ -50,7 +50,8 @@ def selectArtifactId(project, type, defaultName) {
 }
 
 publishing {
-    publications.all {
+    publications {
+        artifact sourcesJar
         artifact javadocsJar
 
         def type = it.name

From f870632b2c21422e35e1e8fdb8e773411ad83805 Mon Sep 17 00:00:00 2001
From: Michael Olmsted <molmsted98@gmail.com>
Date: Tue, 1 Jun 2021 21:05:57 -0400
Subject: [PATCH 10/39] Add sourcesJar definition

---
 gradle/gradle-mvn-mpp-push.gradle | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/gradle/gradle-mvn-mpp-push.gradle b/gradle/gradle-mvn-mpp-push.gradle
index 879c403..118ea61 100644
--- a/gradle/gradle-mvn-mpp-push.gradle
+++ b/gradle/gradle-mvn-mpp-push.gradle
@@ -1,3 +1,4 @@
+apply plugin: 'java-gradle-plugin'
 apply plugin: 'maven-publish'
 apply plugin: 'signing'
 apply plugin: 'org.jetbrains.dokka'
@@ -18,6 +19,10 @@ dokka {
     }
 }
 
+task sourcesJar(type: Jar) {
+    from sourceSets.main.allJava
+}
+
 task emptyJar(type: Jar) {
     archiveAppendix.set("empty")
 }
@@ -51,16 +56,18 @@ def selectArtifactId(project, type, defaultName) {
 
 publishing {
     publications {
-        artifact sourcesJar
-        artifact javadocsJar
+        pluginMaven(MavenPublication) {
+            artifact sourcesJar
+            artifact javadocsJar
 
-        def type = it.name
-        def id = selectArtifactId(project, type, it.artifactId)
-        it.artifactId = id
+            def type = it.name
+            def id = selectArtifactId(project, type, it.artifactId)
+            it.artifactId = id
 
-        if (name == "kotlinMultiplatform") {
-            it.artifact(emptyJar) { classifier 'javadoc' }
-            it.artifact(emptyJar) { classifier 'kdoc' }
+            if (name == "kotlinMultiplatform") {
+                it.artifact(emptyJar) { classifier 'javadoc' }
+                it.artifact(emptyJar) { classifier 'kdoc' }
+            }
         }
     }
 }

From 4fe9109b7a6d76ffb425e4048e59c6125816a0b2 Mon Sep 17 00:00:00 2001
From: Michael Olmsted <molmsted98@gmail.com>
Date: Fri, 11 Jun 2021 18:45:11 -0400
Subject: [PATCH 11/39] Remove extra build artifacts

---
 gradle/gradle-mvn-mpp-push.gradle | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/gradle/gradle-mvn-mpp-push.gradle b/gradle/gradle-mvn-mpp-push.gradle
index 118ea61..817b208 100644
--- a/gradle/gradle-mvn-mpp-push.gradle
+++ b/gradle/gradle-mvn-mpp-push.gradle
@@ -57,9 +57,6 @@ def selectArtifactId(project, type, defaultName) {
 publishing {
     publications {
         pluginMaven(MavenPublication) {
-            artifact sourcesJar
-            artifact javadocsJar
-
             def type = it.name
             def id = selectArtifactId(project, type, it.artifactId)
             it.artifactId = id

From 66e9a180b8325841ed8365f0e441b501c791a9b0 Mon Sep 17 00:00:00 2001
From: Michael Olmsted <molmsted98@gmail.com>
Date: Fri, 18 Jun 2021 08:45:40 -0400
Subject: [PATCH 12/39] Add build artifacts

---
 gradle/gradle-mvn-mpp-push.gradle | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/gradle/gradle-mvn-mpp-push.gradle b/gradle/gradle-mvn-mpp-push.gradle
index 817b208..2aa3e91 100644
--- a/gradle/gradle-mvn-mpp-push.gradle
+++ b/gradle/gradle-mvn-mpp-push.gradle
@@ -64,6 +64,9 @@ publishing {
             if (name == "kotlinMultiplatform") {
                 it.artifact(emptyJar) { classifier 'javadoc' }
                 it.artifact(emptyJar) { classifier 'kdoc' }
+            } else {
+                it.artifact(sourcesJar)
+                it.artifact(javadocsJar)
             }
         }
     }

From 5a1765aca43efc5cf0721f07273279ccf0b8bc5f Mon Sep 17 00:00:00 2001
From: Michael Olmsted <molmsted98@gmail.com>
Date: Wed, 7 Jul 2021 00:19:52 -0400
Subject: [PATCH 13/39] Remove docs artifacts

---
 gradle/gradle-mvn-mpp-push.gradle | 27 +--------------------------
 1 file changed, 1 insertion(+), 26 deletions(-)

diff --git a/gradle/gradle-mvn-mpp-push.gradle b/gradle/gradle-mvn-mpp-push.gradle
index 2aa3e91..8878cf6 100644
--- a/gradle/gradle-mvn-mpp-push.gradle
+++ b/gradle/gradle-mvn-mpp-push.gradle
@@ -1,23 +1,6 @@
 apply plugin: 'java-gradle-plugin'
 apply plugin: 'maven-publish'
 apply plugin: 'signing'
-apply plugin: 'org.jetbrains.dokka'
-
-dokka {
-    outputDirectory = "$rootDir/docs"
-    outputFormat = "gfm"
-
-    multiplatform {
-        global {
-            sourceLink {
-                path = "max/src/commonMain/kotlin"
-                url = "https://github.com/pardom/max/tree/master/max/src/commonMain/kotlin"
-                lineSuffix = "#L"
-            }
-        }
-        common {}
-    }
-}
 
 task sourcesJar(type: Jar) {
     from sourceSets.main.allJava
@@ -27,10 +10,6 @@ task emptyJar(type: Jar) {
     archiveAppendix.set("empty")
 }
 
-task javadocsJar(type: Jar, dependsOn: dokka) {
-    from dokka.outputDirectory
-}
-
 def selectArtifactId(project, type, defaultName) {
     def name = project.name
     def isCommon = project.ext.has("commonStructure")
@@ -61,12 +40,8 @@ publishing {
             def id = selectArtifactId(project, type, it.artifactId)
             it.artifactId = id
 
-            if (name == "kotlinMultiplatform") {
-                it.artifact(emptyJar) { classifier 'javadoc' }
-                it.artifact(emptyJar) { classifier 'kdoc' }
-            } else {
+            if (name != "kotlinMultiplatform") {
                 it.artifact(sourcesJar)
-                it.artifact(javadocsJar)
             }
         }
     }

From 4a0581438efccdf289eed27d9868aca64cc38759 Mon Sep 17 00:00:00 2001
From: Michael Olmsted <molmsted98@gmail.com>
Date: Wed, 7 Jul 2021 01:46:36 -0400
Subject: [PATCH 14/39] Update Kotlin/Gradle

---
 buildSrc/src/main/kotlin/deps/deps.kt    | 2 +-
 gradle/wrapper/gradle-wrapper.properties | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/buildSrc/src/main/kotlin/deps/deps.kt b/buildSrc/src/main/kotlin/deps/deps.kt
index b2d381a..94efdc0 100644
--- a/buildSrc/src/main/kotlin/deps/deps.kt
+++ b/buildSrc/src/main/kotlin/deps/deps.kt
@@ -6,7 +6,7 @@ object Dokka : Group("org.jetbrains.dokka", "0.10.1") {
     }
 }
 
-object Kotlin : Group("org.jetbrains.kotlin", "1.4.32") {
+object Kotlin : Group("org.jetbrains.kotlin", "1.5.20") {
     val StdLib = artifact("kotlin-stdlib")
 
     object Gradle {
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index a4b4429..0f80bbf 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

From c4533048c3ccbc5742ae440d6c691e67d80b1036 Mon Sep 17 00:00:00 2001
From: Michael Olmsted <molmsted98@gmail.com>
Date: Wed, 7 Jul 2021 01:51:03 -0400
Subject: [PATCH 15/39] Remove GradleMetadata Preview

---
 settings.gradle.kts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/settings.gradle.kts b/settings.gradle.kts
index 687ed91..ce76c65 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -1,5 +1,3 @@
-enableFeaturePreview("GRADLE_METADATA")
-
 include(":uri")
 include(":matcher")
 include(":router")

From f7d0ec58b702015b731632b9c550fd9d7b8a97c8 Mon Sep 17 00:00:00 2001
From: Michael Olmsted <molmsted98@gmail.com>
Date: Wed, 7 Jul 2021 01:55:43 -0400
Subject: [PATCH 16/39] Remove tasks from gradle push

---
 gradle/gradle-mvn-mpp-push.gradle | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/gradle/gradle-mvn-mpp-push.gradle b/gradle/gradle-mvn-mpp-push.gradle
index 8878cf6..702e974 100644
--- a/gradle/gradle-mvn-mpp-push.gradle
+++ b/gradle/gradle-mvn-mpp-push.gradle
@@ -2,14 +2,6 @@ apply plugin: 'java-gradle-plugin'
 apply plugin: 'maven-publish'
 apply plugin: 'signing'
 
-task sourcesJar(type: Jar) {
-    from sourceSets.main.allJava
-}
-
-task emptyJar(type: Jar) {
-    archiveAppendix.set("empty")
-}
-
 def selectArtifactId(project, type, defaultName) {
     def name = project.name
     def isCommon = project.ext.has("commonStructure")

From 3222874d2d86f909943ee30f36b4ccf0474448b7 Mon Sep 17 00:00:00 2001
From: Michael Olmsted <molmsted98@gmail.com>
Date: Thu, 8 Jul 2021 21:39:50 -0400
Subject: [PATCH 17/39] Try to publish sources jar

---
 gradle.properties                 |  3 +++
 gradle/gradle-mvn-mpp-push.gradle | 15 +++++++++++++++
 2 files changed, 18 insertions(+)

diff --git a/gradle.properties b/gradle.properties
index 61cccfd..24d2c76 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1 +1,4 @@
 kotlin.native.ignoreDisabledTargets=true
+kotlin.native.distribution.type=prebuilt
+kotlin.mpp.enableGranularSourceSetsMetadata=true
+kotlin.mpp.enableCompatibilityMetadataVariant=true
diff --git a/gradle/gradle-mvn-mpp-push.gradle b/gradle/gradle-mvn-mpp-push.gradle
index 702e974..f1d3792 100644
--- a/gradle/gradle-mvn-mpp-push.gradle
+++ b/gradle/gradle-mvn-mpp-push.gradle
@@ -2,6 +2,21 @@ apply plugin: 'java-gradle-plugin'
 apply plugin: 'maven-publish'
 apply plugin: 'signing'
 
+task sourcesJar(type: Jar) {
+    from sourceSets.main.allJava
+}
+
+afterEvaluate {
+    task mainSourcesJar(type: Jar) {
+        archiveClassifier = 'sources'
+        if (isMultiplatform) {
+            from kotlin.sourceSets.commonMain.kotlin
+        } else {
+            from sourceSets.main.allSource
+        }
+    }
+}
+
 def selectArtifactId(project, type, defaultName) {
     def name = project.name
     def isCommon = project.ext.has("commonStructure")

From 6413517cab8950bfb4b237d082b4da7000db0478 Mon Sep 17 00:00:00 2001
From: Michael Olmsted <molmsted98@gmail.com>
Date: Thu, 8 Jul 2021 22:52:08 -0400
Subject: [PATCH 18/39] Remove sourcesJar task

---
 gradle/gradle-mvn-mpp-push.gradle | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gradle/gradle-mvn-mpp-push.gradle b/gradle/gradle-mvn-mpp-push.gradle
index f1d3792..c06aa43 100644
--- a/gradle/gradle-mvn-mpp-push.gradle
+++ b/gradle/gradle-mvn-mpp-push.gradle
@@ -2,9 +2,9 @@ apply plugin: 'java-gradle-plugin'
 apply plugin: 'maven-publish'
 apply plugin: 'signing'
 
-task sourcesJar(type: Jar) {
-    from sourceSets.main.allJava
-}
+//task sourcesJar(type: Jar) {
+//    from sourceSets.main.allJava
+//}
 
 afterEvaluate {
     task mainSourcesJar(type: Jar) {

From 6caef0637698c515b4db5407f44275ee5273cc3e Mon Sep 17 00:00:00 2001
From: Michael Olmsted <molmsted98@gmail.com>
Date: Thu, 8 Jul 2021 23:01:55 -0400
Subject: [PATCH 19/39] Remove multiplatform check

---
 gradle/gradle-mvn-mpp-push.gradle | 25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/gradle/gradle-mvn-mpp-push.gradle b/gradle/gradle-mvn-mpp-push.gradle
index c06aa43..629cba6 100644
--- a/gradle/gradle-mvn-mpp-push.gradle
+++ b/gradle/gradle-mvn-mpp-push.gradle
@@ -6,16 +6,16 @@ apply plugin: 'signing'
 //    from sourceSets.main.allJava
 //}
 
-afterEvaluate {
-    task mainSourcesJar(type: Jar) {
-        archiveClassifier = 'sources'
-        if (isMultiplatform) {
-            from kotlin.sourceSets.commonMain.kotlin
-        } else {
-            from sourceSets.main.allSource
-        }
-    }
-}
+//afterEvaluate {
+//    task mainSourcesJar(type: Jar) {
+//        archiveClassifier = 'sources'
+//        if (isMultiplatform) {
+//            from kotlin.sourceSets.commonMain.kotlin
+//        } else {
+//            from sourceSets.main.allSource
+//        }
+//    }
+//}
 
 def selectArtifactId(project, type, defaultName) {
     def name = project.name
@@ -46,10 +46,7 @@ publishing {
             def type = it.name
             def id = selectArtifactId(project, type, it.artifactId)
             it.artifactId = id
-
-            if (name != "kotlinMultiplatform") {
-                it.artifact(sourcesJar)
-            }
+            it.artifact(sourcesJar)
         }
     }
 }

From ee6b4e718aa29d59163284b372ffae55c3ea2219 Mon Sep 17 00:00:00 2001
From: Michael Olmsted <molmsted98@gmail.com>
Date: Thu, 8 Jul 2021 23:19:37 -0400
Subject: [PATCH 20/39] Remove artifact assigning

---
 gradle/gradle-mvn-mpp-push.gradle | 21 +--------------------
 1 file changed, 1 insertion(+), 20 deletions(-)

diff --git a/gradle/gradle-mvn-mpp-push.gradle b/gradle/gradle-mvn-mpp-push.gradle
index 629cba6..32157dd 100644
--- a/gradle/gradle-mvn-mpp-push.gradle
+++ b/gradle/gradle-mvn-mpp-push.gradle
@@ -1,21 +1,5 @@
 apply plugin: 'java-gradle-plugin'
 apply plugin: 'maven-publish'
-apply plugin: 'signing'
-
-//task sourcesJar(type: Jar) {
-//    from sourceSets.main.allJava
-//}
-
-//afterEvaluate {
-//    task mainSourcesJar(type: Jar) {
-//        archiveClassifier = 'sources'
-//        if (isMultiplatform) {
-//            from kotlin.sourceSets.commonMain.kotlin
-//        } else {
-//            from sourceSets.main.allSource
-//        }
-//    }
-//}
 
 def selectArtifactId(project, type, defaultName) {
     def name = project.name
@@ -43,10 +27,7 @@ def selectArtifactId(project, type, defaultName) {
 publishing {
     publications {
         pluginMaven(MavenPublication) {
-            def type = it.name
-            def id = selectArtifactId(project, type, it.artifactId)
-            it.artifactId = id
-            it.artifact(sourcesJar)
+            it.artifactId = selectArtifactId(project, it.name, it.artifactId)
         }
     }
 }

From 4f9cbb404d0080270545feec8d74a3dd3884ec4a Mon Sep 17 00:00:00 2001
From: Michael Olmsted <molmsted98@gmail.com>
Date: Thu, 8 Jul 2021 23:38:31 -0400
Subject: [PATCH 21/39] Remove application of gradle script

---
 matcher/build.gradle.kts   | 7 +------
 navigator/build.gradle.kts | 7 +------
 router/build.gradle.kts    | 7 +------
 uri/build.gradle.kts       | 7 +------
 4 files changed, 4 insertions(+), 24 deletions(-)

diff --git a/matcher/build.gradle.kts b/matcher/build.gradle.kts
index bb77e69..f012c3d 100755
--- a/matcher/build.gradle.kts
+++ b/matcher/build.gradle.kts
@@ -2,10 +2,7 @@ import org.jetbrains.kotlin.gradle.plugin.mpp.AbstractKotlinNativeTargetPreset
 
 plugins {
     kotlin("multiplatform")
-}
-
-repositories {
-    jcenter()
+    id("com.vanniktech.maven.publish")
 }
 
 kotlin {
@@ -45,5 +42,3 @@ tasks.withType(Test::class) {
         includeEngines("spek2")
     }
 }
-
-apply("$rootDir/gradle/gradle-mvn-mpp-push.gradle")
diff --git a/navigator/build.gradle.kts b/navigator/build.gradle.kts
index 2ad3c6f..7154617 100755
--- a/navigator/build.gradle.kts
+++ b/navigator/build.gradle.kts
@@ -2,10 +2,7 @@ import org.jetbrains.kotlin.gradle.plugin.mpp.AbstractKotlinNativeTargetPreset
 
 plugins {
     kotlin("multiplatform")
-}
-
-repositories {
-    jcenter()
+    id("com.vanniktech.maven.publish")
 }
 
 kotlin {
@@ -47,5 +44,3 @@ tasks.withType(Test::class) {
         includeEngines("spek2")
     }
 }
-
-apply("$rootDir/gradle/gradle-mvn-mpp-push.gradle")
diff --git a/router/build.gradle.kts b/router/build.gradle.kts
index 313b6de..f10f3b6 100755
--- a/router/build.gradle.kts
+++ b/router/build.gradle.kts
@@ -2,10 +2,7 @@ import org.jetbrains.kotlin.gradle.plugin.mpp.AbstractKotlinNativeTargetPreset
 
 plugins {
     kotlin("multiplatform")
-}
-
-repositories {
-    jcenter()
+    id("com.vanniktech.maven.publish")
 }
 
 kotlin {
@@ -47,5 +44,3 @@ tasks.withType(Test::class) {
         includeEngines("spek2")
     }
 }
-
-apply("$rootDir/gradle/gradle-mvn-mpp-push.gradle")
diff --git a/uri/build.gradle.kts b/uri/build.gradle.kts
index bb77e69..f012c3d 100755
--- a/uri/build.gradle.kts
+++ b/uri/build.gradle.kts
@@ -2,10 +2,7 @@ import org.jetbrains.kotlin.gradle.plugin.mpp.AbstractKotlinNativeTargetPreset
 
 plugins {
     kotlin("multiplatform")
-}
-
-repositories {
-    jcenter()
+    id("com.vanniktech.maven.publish")
 }
 
 kotlin {
@@ -45,5 +42,3 @@ tasks.withType(Test::class) {
         includeEngines("spek2")
     }
 }
-
-apply("$rootDir/gradle/gradle-mvn-mpp-push.gradle")

From 06eaecb97fca53b576fdb05fce14806ed7289c41 Mon Sep 17 00:00:00 2001
From: Michael Olmsted <molmsted98@gmail.com>
Date: Thu, 8 Jul 2021 23:44:19 -0400
Subject: [PATCH 22/39] Add publish classpath

---
 build.gradle.kts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build.gradle.kts b/build.gradle.kts
index d68e5f2..0cdb5f3 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -6,6 +6,7 @@ buildscript {
     dependencies {
         classpath(deps.Kotlin.Gradle.Plugin)
         classpath(deps.Dokka.Gradle.Plugin)
+        classpath("com.vanniktech:gradle-maven-publish-plugin:0.13.0")
     }
 }
 

From 030bd5b38ac773729428db9c45ce08e1a4e85379 Mon Sep 17 00:00:00 2001
From: Michael Olmsted <molmsted98@gmail.com>
Date: Fri, 9 Jul 2021 00:02:12 -0400
Subject: [PATCH 23/39] Add POM information

---
 gradle.properties | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/gradle.properties b/gradle.properties
index 24d2c76..6828395 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,3 +2,20 @@ kotlin.native.ignoreDisabledTargets=true
 kotlin.native.distribution.type=prebuilt
 kotlin.mpp.enableGranularSourceSetsMetadata=true
 kotlin.mpp.enableCompatibilityMetadataVariant=true
+
+GROUP=com.github.molmsted98.max
+VERSION_NAME=1.0.21
+
+POM_INCEPTION_YEAR=2021
+
+POM_URL=https://github.com/molmsted98/max/
+POM_SCM_URL=https://github.com/molmsted98/max/
+POM_SCM_CONNECTION=scm:git:git://github.com/molmsted98/max.git
+
+POM_LICENCE_NAME=The Apache Software License, Version 2.0
+POM_LICENCE_URL=http://www.apache.org/licenses/LICENSE-2.0.txt
+POM_LICENCE_DIST=repo
+
+POM_DEVELOPER_ID=molmsted98
+POM_DEVELOPER_NAME=Michael Olmsted
+POM_DEVELOPER_URL=https://github.com/molmsted98/

From b03117677c56358cc59dd8d60e862de69a545d74 Mon Sep 17 00:00:00 2001
From: Michael Olmsted <molmsted98@gmail.com>
Date: Fri, 9 Jul 2021 00:09:47 -0400
Subject: [PATCH 24/39] Add pom artifact

---
 gradle.properties | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 6828395..f71e33e 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,10 +4,11 @@ kotlin.mpp.enableGranularSourceSetsMetadata=true
 kotlin.mpp.enableCompatibilityMetadataVariant=true
 
 GROUP=com.github.molmsted98.max
-VERSION_NAME=1.0.21
+VERSION_NAME=1.0.22
 
 POM_INCEPTION_YEAR=2021
 
+POM_ARTIFACT_ID=max
 POM_URL=https://github.com/molmsted98/max/
 POM_SCM_URL=https://github.com/molmsted98/max/
 POM_SCM_CONNECTION=scm:git:git://github.com/molmsted98/max.git

From 74f3f667af4d1bf47948ecf34ae3fd9b6681f13a Mon Sep 17 00:00:00 2001
From: Michael Olmsted <molmsted98@gmail.com>
Date: Fri, 9 Jul 2021 00:18:50 -0400
Subject: [PATCH 25/39] Bump maven publish classpath

---
 build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 0cdb5f3..e56a48a 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -6,7 +6,7 @@ buildscript {
     dependencies {
         classpath(deps.Kotlin.Gradle.Plugin)
         classpath(deps.Dokka.Gradle.Plugin)
-        classpath("com.vanniktech:gradle-maven-publish-plugin:0.13.0")
+        classpath("com.vanniktech:gradle-maven-publish-plugin:0.17.0")
     }
 }
 

From 938756846bfed98a7fe1d729811fffcdcb76843a Mon Sep 17 00:00:00 2001
From: Michael Olmsted <molmsted98@gmail.com>
Date: Fri, 9 Jul 2021 00:19:08 -0400
Subject: [PATCH 26/39] Bump version number

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index f71e33e..14a8acb 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,7 +4,7 @@ kotlin.mpp.enableGranularSourceSetsMetadata=true
 kotlin.mpp.enableCompatibilityMetadataVariant=true
 
 GROUP=com.github.molmsted98.max
-VERSION_NAME=1.0.22
+VERSION_NAME=1.0.23
 
 POM_INCEPTION_YEAR=2021
 

From 34a7f7ef466d9bc8c9699da6e14f585f291a44a6 Mon Sep 17 00:00:00 2001
From: Michael Olmsted <molmsted98@gmail.com>
Date: Fri, 9 Jul 2021 00:28:17 -0400
Subject: [PATCH 27/39] Add repositories

---
 build.gradle.kts  | 5 +++++
 gradle.properties | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index e56a48a..abccaea 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -10,3 +10,8 @@ buildscript {
     }
 }
 
+subprojects {
+    repositories {
+        mavenCentral()
+    }
+}
diff --git a/gradle.properties b/gradle.properties
index 14a8acb..2a4512a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,7 +4,7 @@ kotlin.mpp.enableGranularSourceSetsMetadata=true
 kotlin.mpp.enableCompatibilityMetadataVariant=true
 
 GROUP=com.github.molmsted98.max
-VERSION_NAME=1.0.23
+VERSION_NAME=1.0.24
 
 POM_INCEPTION_YEAR=2021
 

From 0e447bea26cd685865d00b2c10e5b66da82e1119 Mon Sep 17 00:00:00 2001
From: Michael Olmsted <molmsted98@gmail.com>
Date: Fri, 9 Jul 2021 00:37:42 -0400
Subject: [PATCH 28/39] Add signing config

---
 matcher/build.gradle.kts   | 6 ++++++
 navigator/build.gradle.kts | 6 ++++++
 router/build.gradle.kts    | 6 ++++++
 uri/build.gradle.kts       | 6 ++++++
 4 files changed, 24 insertions(+)

diff --git a/matcher/build.gradle.kts b/matcher/build.gradle.kts
index f012c3d..a885bfd 100755
--- a/matcher/build.gradle.kts
+++ b/matcher/build.gradle.kts
@@ -37,6 +37,12 @@ kotlin {
     }
 }
 
+signing {
+    val SIGNING_PRIVATE_KEY: String? by project
+    val SIGNING_PASSWORD: String? by project
+    useInMemoryPgpKeys(SIGNING_PRIVATE_KEY, SIGNING_PASSWORD)
+}
+
 tasks.withType(Test::class) {
     useJUnitPlatform {
         includeEngines("spek2")
diff --git a/navigator/build.gradle.kts b/navigator/build.gradle.kts
index 7154617..7d57141 100755
--- a/navigator/build.gradle.kts
+++ b/navigator/build.gradle.kts
@@ -39,6 +39,12 @@ kotlin {
     }
 }
 
+signing {
+    val SIGNING_PRIVATE_KEY: String? by project
+    val SIGNING_PASSWORD: String? by project
+    useInMemoryPgpKeys(SIGNING_PRIVATE_KEY, SIGNING_PASSWORD)
+}
+
 tasks.withType(Test::class) {
     useJUnitPlatform {
         includeEngines("spek2")
diff --git a/router/build.gradle.kts b/router/build.gradle.kts
index f10f3b6..5733b91 100755
--- a/router/build.gradle.kts
+++ b/router/build.gradle.kts
@@ -39,6 +39,12 @@ kotlin {
     }
 }
 
+signing {
+    val SIGNING_PRIVATE_KEY: String? by project
+    val SIGNING_PASSWORD: String? by project
+    useInMemoryPgpKeys(SIGNING_PRIVATE_KEY, SIGNING_PASSWORD)
+}
+
 tasks.withType(Test::class) {
     useJUnitPlatform {
         includeEngines("spek2")
diff --git a/uri/build.gradle.kts b/uri/build.gradle.kts
index f012c3d..a885bfd 100755
--- a/uri/build.gradle.kts
+++ b/uri/build.gradle.kts
@@ -37,6 +37,12 @@ kotlin {
     }
 }
 
+signing {
+    val SIGNING_PRIVATE_KEY: String? by project
+    val SIGNING_PASSWORD: String? by project
+    useInMemoryPgpKeys(SIGNING_PRIVATE_KEY, SIGNING_PASSWORD)
+}
+
 tasks.withType(Test::class) {
     useJUnitPlatform {
         includeEngines("spek2")

From 2373a98e17e1ed73d8d0670779c92cbb66d4adc5 Mon Sep 17 00:00:00 2001
From: Michael Olmsted <molmsted98@gmail.com>
Date: Fri, 9 Jul 2021 00:38:10 -0400
Subject: [PATCH 29/39] Bump version number

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 2a4512a..9636aab 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,7 +4,7 @@ kotlin.mpp.enableGranularSourceSetsMetadata=true
 kotlin.mpp.enableCompatibilityMetadataVariant=true
 
 GROUP=com.github.molmsted98.max
-VERSION_NAME=1.0.24
+VERSION_NAME=1.0.25
 
 POM_INCEPTION_YEAR=2021
 

From 9abc064d88de792a07e18b0f1467384d7a3fd1d3 Mon Sep 17 00:00:00 2001
From: Michael Olmsted <molmsted98@gmail.com>
Date: Fri, 9 Jul 2021 12:57:23 -0400
Subject: [PATCH 30/39] Disable signing

---
 matcher/build.gradle.kts   | 12 ++++++++----
 navigator/build.gradle.kts | 12 ++++++++----
 router/build.gradle.kts    | 12 ++++++++----
 uri/build.gradle.kts       | 12 ++++++++----
 4 files changed, 32 insertions(+), 16 deletions(-)

diff --git a/matcher/build.gradle.kts b/matcher/build.gradle.kts
index a885bfd..9e7274d 100755
--- a/matcher/build.gradle.kts
+++ b/matcher/build.gradle.kts
@@ -37,10 +37,14 @@ kotlin {
     }
 }
 
-signing {
-    val SIGNING_PRIVATE_KEY: String? by project
-    val SIGNING_PASSWORD: String? by project
-    useInMemoryPgpKeys(SIGNING_PRIVATE_KEY, SIGNING_PASSWORD)
+//signing {
+//    val SIGNING_PRIVATE_KEY: String? by project
+//    val SIGNING_PASSWORD: String? by project
+//    useInMemoryPgpKeys(SIGNING_PRIVATE_KEY, SIGNING_PASSWORD)
+//}
+
+tasks.withType(Sign::class) {
+    enabled = false
 }
 
 tasks.withType(Test::class) {
diff --git a/navigator/build.gradle.kts b/navigator/build.gradle.kts
index 7d57141..86ff10f 100755
--- a/navigator/build.gradle.kts
+++ b/navigator/build.gradle.kts
@@ -39,10 +39,14 @@ kotlin {
     }
 }
 
-signing {
-    val SIGNING_PRIVATE_KEY: String? by project
-    val SIGNING_PASSWORD: String? by project
-    useInMemoryPgpKeys(SIGNING_PRIVATE_KEY, SIGNING_PASSWORD)
+//signing {
+//    val SIGNING_PRIVATE_KEY: String? by project
+//    val SIGNING_PASSWORD: String? by project
+//    useInMemoryPgpKeys(SIGNING_PRIVATE_KEY, SIGNING_PASSWORD)
+//}
+
+tasks.withType(Sign::class) {
+    enabled = false
 }
 
 tasks.withType(Test::class) {
diff --git a/router/build.gradle.kts b/router/build.gradle.kts
index 5733b91..af885ed 100755
--- a/router/build.gradle.kts
+++ b/router/build.gradle.kts
@@ -39,10 +39,14 @@ kotlin {
     }
 }
 
-signing {
-    val SIGNING_PRIVATE_KEY: String? by project
-    val SIGNING_PASSWORD: String? by project
-    useInMemoryPgpKeys(SIGNING_PRIVATE_KEY, SIGNING_PASSWORD)
+//signing {
+//    val SIGNING_PRIVATE_KEY: String? by project
+//    val SIGNING_PASSWORD: String? by project
+//    useInMemoryPgpKeys(SIGNING_PRIVATE_KEY, SIGNING_PASSWORD)
+//}
+
+tasks.withType(Sign::class) {
+    enabled = false
 }
 
 tasks.withType(Test::class) {
diff --git a/uri/build.gradle.kts b/uri/build.gradle.kts
index a885bfd..9e7274d 100755
--- a/uri/build.gradle.kts
+++ b/uri/build.gradle.kts
@@ -37,10 +37,14 @@ kotlin {
     }
 }
 
-signing {
-    val SIGNING_PRIVATE_KEY: String? by project
-    val SIGNING_PASSWORD: String? by project
-    useInMemoryPgpKeys(SIGNING_PRIVATE_KEY, SIGNING_PASSWORD)
+//signing {
+//    val SIGNING_PRIVATE_KEY: String? by project
+//    val SIGNING_PASSWORD: String? by project
+//    useInMemoryPgpKeys(SIGNING_PRIVATE_KEY, SIGNING_PASSWORD)
+//}
+
+tasks.withType(Sign::class) {
+    enabled = false
 }
 
 tasks.withType(Test::class) {

From 62d75b2403cdd7a594bfa2961619bb29180f4ad5 Mon Sep 17 00:00:00 2001
From: Michael Olmsted <molmsted98@gmail.com>
Date: Fri, 9 Jul 2021 12:57:33 -0400
Subject: [PATCH 31/39] Bump version number

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 9636aab..3772d14 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,7 +4,7 @@ kotlin.mpp.enableGranularSourceSetsMetadata=true
 kotlin.mpp.enableCompatibilityMetadataVariant=true
 
 GROUP=com.github.molmsted98.max
-VERSION_NAME=1.0.25
+VERSION_NAME=1.0.26
 
 POM_INCEPTION_YEAR=2021
 

From d78aec457b0e0f7e8c672f9700e66d7a80a955b6 Mon Sep 17 00:00:00 2001
From: Michael Olmsted <molmsted98@gmail.com>
Date: Fri, 9 Jul 2021 14:55:29 -0400
Subject: [PATCH 32/39] Add module-based artifact ids

---
 gradle.properties           | 3 +--
 matcher/gradle.properties   | 3 +++
 navigator/gradle.properties | 3 +++
 router/gradle.properties    | 3 +++
 uri/gradle.properties       | 3 +++
 5 files changed, 13 insertions(+), 2 deletions(-)
 create mode 100644 matcher/gradle.properties
 create mode 100644 navigator/gradle.properties
 create mode 100644 router/gradle.properties
 create mode 100644 uri/gradle.properties

diff --git a/gradle.properties b/gradle.properties
index 3772d14..acbd9bd 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,11 +4,10 @@ kotlin.mpp.enableGranularSourceSetsMetadata=true
 kotlin.mpp.enableCompatibilityMetadataVariant=true
 
 GROUP=com.github.molmsted98.max
-VERSION_NAME=1.0.26
+VERSION_NAME=1.0.27
 
 POM_INCEPTION_YEAR=2021
 
-POM_ARTIFACT_ID=max
 POM_URL=https://github.com/molmsted98/max/
 POM_SCM_URL=https://github.com/molmsted98/max/
 POM_SCM_CONNECTION=scm:git:git://github.com/molmsted98/max.git
diff --git a/matcher/gradle.properties b/matcher/gradle.properties
new file mode 100644
index 0000000..4eff17a
--- /dev/null
+++ b/matcher/gradle.properties
@@ -0,0 +1,3 @@
+POM_ARTIFACT_ID=matcher
+POM_NAME=matcher
+POM_DESCRIPTION=Matcher.
diff --git a/navigator/gradle.properties b/navigator/gradle.properties
new file mode 100644
index 0000000..61553f0
--- /dev/null
+++ b/navigator/gradle.properties
@@ -0,0 +1,3 @@
+POM_ARTIFACT_ID=navigator
+POM_NAME=navigator
+POM_DESCRIPTION=Navigator implementation.
diff --git a/router/gradle.properties b/router/gradle.properties
new file mode 100644
index 0000000..ed85420
--- /dev/null
+++ b/router/gradle.properties
@@ -0,0 +1,3 @@
+POM_ARTIFACT_ID=router
+POM_NAME=router
+POM_DESCRIPTION=Navigation router.
diff --git a/uri/gradle.properties b/uri/gradle.properties
new file mode 100644
index 0000000..50ffd9c
--- /dev/null
+++ b/uri/gradle.properties
@@ -0,0 +1,3 @@
+POM_ARTIFACT_ID=uri
+POM_NAME=uri
+POM_DESCRIPTION=Representation of a URI.

From 3ab8dc3e029d59ca60ad22a839cc029075bd4222 Mon Sep 17 00:00:00 2001
From: Michael Olmsted <molmsted98@gmail.com>
Date: Fri, 9 Jul 2021 15:10:21 -0400
Subject: [PATCH 33/39] Add iOS targets

---
 gradle.properties          |  2 +-
 matcher/build.gradle.kts   | 14 ++++++++------
 navigator/build.gradle.kts | 14 ++++++++------
 router/build.gradle.kts    | 14 ++++++++------
 uri/build.gradle.kts       | 14 ++++++++------
 5 files changed, 33 insertions(+), 25 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index acbd9bd..13d3c5a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,7 +4,7 @@ kotlin.mpp.enableGranularSourceSetsMetadata=true
 kotlin.mpp.enableCompatibilityMetadataVariant=true
 
 GROUP=com.github.molmsted98.max
-VERSION_NAME=1.0.27
+VERSION_NAME=1.0.28
 
 POM_INCEPTION_YEAR=2021
 
diff --git a/matcher/build.gradle.kts b/matcher/build.gradle.kts
index 9e7274d..7554943 100755
--- a/matcher/build.gradle.kts
+++ b/matcher/build.gradle.kts
@@ -8,6 +8,14 @@ plugins {
 kotlin {
     jvm()
 
+    val sdkName: String? = System.getenv("SDK_NAME")
+    val isiOSDevice = sdkName.orEmpty().startsWith("iphoneos")
+    if (isiOSDevice) {
+        iosArm64("iOS")
+    } else {
+        iosX64("iOS")
+    }
+
     sourceSets {
         val commonMain by getting {
             dependencies {
@@ -37,12 +45,6 @@ kotlin {
     }
 }
 
-//signing {
-//    val SIGNING_PRIVATE_KEY: String? by project
-//    val SIGNING_PASSWORD: String? by project
-//    useInMemoryPgpKeys(SIGNING_PRIVATE_KEY, SIGNING_PASSWORD)
-//}
-
 tasks.withType(Sign::class) {
     enabled = false
 }
diff --git a/navigator/build.gradle.kts b/navigator/build.gradle.kts
index 86ff10f..0ee5aa9 100755
--- a/navigator/build.gradle.kts
+++ b/navigator/build.gradle.kts
@@ -8,6 +8,14 @@ plugins {
 kotlin {
     jvm()
 
+    val sdkName: String? = System.getenv("SDK_NAME")
+    val isiOSDevice = sdkName.orEmpty().startsWith("iphoneos")
+    if (isiOSDevice) {
+        iosArm64("iOS")
+    } else {
+        iosX64("iOS")
+    }
+
     sourceSets {
         val commonMain by getting {
             dependencies {
@@ -39,12 +47,6 @@ kotlin {
     }
 }
 
-//signing {
-//    val SIGNING_PRIVATE_KEY: String? by project
-//    val SIGNING_PASSWORD: String? by project
-//    useInMemoryPgpKeys(SIGNING_PRIVATE_KEY, SIGNING_PASSWORD)
-//}
-
 tasks.withType(Sign::class) {
     enabled = false
 }
diff --git a/router/build.gradle.kts b/router/build.gradle.kts
index af885ed..9e4917e 100755
--- a/router/build.gradle.kts
+++ b/router/build.gradle.kts
@@ -8,6 +8,14 @@ plugins {
 kotlin {
     jvm()
 
+    val sdkName: String? = System.getenv("SDK_NAME")
+    val isiOSDevice = sdkName.orEmpty().startsWith("iphoneos")
+    if (isiOSDevice) {
+        iosArm64("iOS")
+    } else {
+        iosX64("iOS")
+    }
+
     sourceSets {
         val commonMain by getting {
             dependencies {
@@ -39,12 +47,6 @@ kotlin {
     }
 }
 
-//signing {
-//    val SIGNING_PRIVATE_KEY: String? by project
-//    val SIGNING_PASSWORD: String? by project
-//    useInMemoryPgpKeys(SIGNING_PRIVATE_KEY, SIGNING_PASSWORD)
-//}
-
 tasks.withType(Sign::class) {
     enabled = false
 }
diff --git a/uri/build.gradle.kts b/uri/build.gradle.kts
index 9e7274d..7554943 100755
--- a/uri/build.gradle.kts
+++ b/uri/build.gradle.kts
@@ -8,6 +8,14 @@ plugins {
 kotlin {
     jvm()
 
+    val sdkName: String? = System.getenv("SDK_NAME")
+    val isiOSDevice = sdkName.orEmpty().startsWith("iphoneos")
+    if (isiOSDevice) {
+        iosArm64("iOS")
+    } else {
+        iosX64("iOS")
+    }
+
     sourceSets {
         val commonMain by getting {
             dependencies {
@@ -37,12 +45,6 @@ kotlin {
     }
 }
 
-//signing {
-//    val SIGNING_PRIVATE_KEY: String? by project
-//    val SIGNING_PASSWORD: String? by project
-//    useInMemoryPgpKeys(SIGNING_PRIVATE_KEY, SIGNING_PASSWORD)
-//}
-
 tasks.withType(Sign::class) {
     enabled = false
 }

From 22ca2d85a638efc87b56684dca948f207ca9184e Mon Sep 17 00:00:00 2001
From: Michael Olmsted <molmsted98@gmail.com>
Date: Fri, 9 Jul 2021 15:19:35 -0400
Subject: [PATCH 34/39] Add all other targets

---
 gradle.properties          |  2 +-
 matcher/build.gradle.kts   | 17 +++++++++++------
 navigator/build.gradle.kts | 17 +++++++++++------
 router/build.gradle.kts    | 17 +++++++++++------
 uri/build.gradle.kts       | 17 +++++++++++------
 5 files changed, 45 insertions(+), 25 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 13d3c5a..0fb5a62 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,7 +4,7 @@ kotlin.mpp.enableGranularSourceSetsMetadata=true
 kotlin.mpp.enableCompatibilityMetadataVariant=true
 
 GROUP=com.github.molmsted98.max
-VERSION_NAME=1.0.28
+VERSION_NAME=1.0.29
 
 POM_INCEPTION_YEAR=2021
 
diff --git a/matcher/build.gradle.kts b/matcher/build.gradle.kts
index 7554943..a3a1ef1 100755
--- a/matcher/build.gradle.kts
+++ b/matcher/build.gradle.kts
@@ -8,14 +8,19 @@ plugins {
 kotlin {
     jvm()
 
-    val sdkName: String? = System.getenv("SDK_NAME")
-    val isiOSDevice = sdkName.orEmpty().startsWith("iphoneos")
-    if (isiOSDevice) {
-        iosArm64("iOS")
-    } else {
-        iosX64("iOS")
+    js {
+        browser()
+        nodejs()
     }
 
+    ios()
+    tvos()
+    watchos()
+
+    linuxX64()
+    macosX64()
+    mingwX64()
+
     sourceSets {
         val commonMain by getting {
             dependencies {
diff --git a/navigator/build.gradle.kts b/navigator/build.gradle.kts
index 0ee5aa9..159ca95 100755
--- a/navigator/build.gradle.kts
+++ b/navigator/build.gradle.kts
@@ -8,14 +8,19 @@ plugins {
 kotlin {
     jvm()
 
-    val sdkName: String? = System.getenv("SDK_NAME")
-    val isiOSDevice = sdkName.orEmpty().startsWith("iphoneos")
-    if (isiOSDevice) {
-        iosArm64("iOS")
-    } else {
-        iosX64("iOS")
+    js {
+        browser()
+        nodejs()
     }
 
+    ios()
+    tvos()
+    watchos()
+
+    linuxX64()
+    macosX64()
+    mingwX64()
+
     sourceSets {
         val commonMain by getting {
             dependencies {
diff --git a/router/build.gradle.kts b/router/build.gradle.kts
index 9e4917e..31801d4 100755
--- a/router/build.gradle.kts
+++ b/router/build.gradle.kts
@@ -8,14 +8,19 @@ plugins {
 kotlin {
     jvm()
 
-    val sdkName: String? = System.getenv("SDK_NAME")
-    val isiOSDevice = sdkName.orEmpty().startsWith("iphoneos")
-    if (isiOSDevice) {
-        iosArm64("iOS")
-    } else {
-        iosX64("iOS")
+    js {
+        browser()
+        nodejs()
     }
 
+    ios()
+    tvos()
+    watchos()
+
+    linuxX64()
+    macosX64()
+    mingwX64()
+
     sourceSets {
         val commonMain by getting {
             dependencies {
diff --git a/uri/build.gradle.kts b/uri/build.gradle.kts
index 7554943..a3a1ef1 100755
--- a/uri/build.gradle.kts
+++ b/uri/build.gradle.kts
@@ -8,14 +8,19 @@ plugins {
 kotlin {
     jvm()
 
-    val sdkName: String? = System.getenv("SDK_NAME")
-    val isiOSDevice = sdkName.orEmpty().startsWith("iphoneos")
-    if (isiOSDevice) {
-        iosArm64("iOS")
-    } else {
-        iosX64("iOS")
+    js {
+        browser()
+        nodejs()
     }
 
+    ios()
+    tvos()
+    watchos()
+
+    linuxX64()
+    macosX64()
+    mingwX64()
+
     sourceSets {
         val commonMain by getting {
             dependencies {

From 94b9f500da4271266fa68c73b854e26f8e10ce66 Mon Sep 17 00:00:00 2001
From: Michael Olmsted <molmsted98@gmail.com>
Date: Fri, 9 Jul 2021 17:21:18 -0400
Subject: [PATCH 35/39] Add ios targets

---
 gradle.properties          | 2 +-
 matcher/build.gradle.kts   | 8 +++++++-
 navigator/build.gradle.kts | 8 +++++++-
 router/build.gradle.kts    | 8 +++++++-
 uri/build.gradle.kts       | 8 +++++++-
 5 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 0fb5a62..ce9c348 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,7 +4,7 @@ kotlin.mpp.enableGranularSourceSetsMetadata=true
 kotlin.mpp.enableCompatibilityMetadataVariant=true
 
 GROUP=com.github.molmsted98.max
-VERSION_NAME=1.0.29
+VERSION_NAME=1.0.30
 
 POM_INCEPTION_YEAR=2021
 
diff --git a/matcher/build.gradle.kts b/matcher/build.gradle.kts
index a3a1ef1..f17fedd 100755
--- a/matcher/build.gradle.kts
+++ b/matcher/build.gradle.kts
@@ -13,7 +13,13 @@ kotlin {
         nodejs()
     }
 
-    ios()
+    val onPhone = System.getenv("SDK_NAME")?.startsWith("iphoneos") ?: false
+    if (onPhone) {
+        iosArm64("ios")
+    } else {
+        iosX64("ios")
+    }
+
     tvos()
     watchos()
 
diff --git a/navigator/build.gradle.kts b/navigator/build.gradle.kts
index 159ca95..2238444 100755
--- a/navigator/build.gradle.kts
+++ b/navigator/build.gradle.kts
@@ -13,7 +13,13 @@ kotlin {
         nodejs()
     }
 
-    ios()
+    val onPhone = System.getenv("SDK_NAME")?.startsWith("iphoneos") ?: false
+    if (onPhone) {
+        iosArm64("ios")
+    } else {
+        iosX64("ios")
+    }
+
     tvos()
     watchos()
 
diff --git a/router/build.gradle.kts b/router/build.gradle.kts
index 31801d4..06b3546 100755
--- a/router/build.gradle.kts
+++ b/router/build.gradle.kts
@@ -13,7 +13,13 @@ kotlin {
         nodejs()
     }
 
-    ios()
+    val onPhone = System.getenv("SDK_NAME")?.startsWith("iphoneos") ?: false
+    if (onPhone) {
+        iosArm64("ios")
+    } else {
+        iosX64("ios")
+    }
+
     tvos()
     watchos()
 
diff --git a/uri/build.gradle.kts b/uri/build.gradle.kts
index a3a1ef1..f17fedd 100755
--- a/uri/build.gradle.kts
+++ b/uri/build.gradle.kts
@@ -13,7 +13,13 @@ kotlin {
         nodejs()
     }
 
-    ios()
+    val onPhone = System.getenv("SDK_NAME")?.startsWith("iphoneos") ?: false
+    if (onPhone) {
+        iosArm64("ios")
+    } else {
+        iosX64("ios")
+    }
+
     tvos()
     watchos()
 

From 1d705d9fba231e9efca88ea9d4946cb4df26b40b Mon Sep 17 00:00:00 2001
From: Michael Olmsted <molmsted98@gmail.com>
Date: Fri, 9 Jul 2021 17:30:22 -0400
Subject: [PATCH 36/39] Remove ios target names

---
 matcher/build.gradle.kts   | 4 ++--
 navigator/build.gradle.kts | 4 ++--
 router/build.gradle.kts    | 4 ++--
 uri/build.gradle.kts       | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/matcher/build.gradle.kts b/matcher/build.gradle.kts
index f17fedd..b6f4a7a 100755
--- a/matcher/build.gradle.kts
+++ b/matcher/build.gradle.kts
@@ -15,9 +15,9 @@ kotlin {
 
     val onPhone = System.getenv("SDK_NAME")?.startsWith("iphoneos") ?: false
     if (onPhone) {
-        iosArm64("ios")
+        iosArm64()
     } else {
-        iosX64("ios")
+        iosX64()
     }
 
     tvos()
diff --git a/navigator/build.gradle.kts b/navigator/build.gradle.kts
index 2238444..2a05b2e 100755
--- a/navigator/build.gradle.kts
+++ b/navigator/build.gradle.kts
@@ -15,9 +15,9 @@ kotlin {
 
     val onPhone = System.getenv("SDK_NAME")?.startsWith("iphoneos") ?: false
     if (onPhone) {
-        iosArm64("ios")
+        iosArm64()
     } else {
-        iosX64("ios")
+        iosX64()
     }
 
     tvos()
diff --git a/router/build.gradle.kts b/router/build.gradle.kts
index 06b3546..7598c15 100755
--- a/router/build.gradle.kts
+++ b/router/build.gradle.kts
@@ -15,9 +15,9 @@ kotlin {
 
     val onPhone = System.getenv("SDK_NAME")?.startsWith("iphoneos") ?: false
     if (onPhone) {
-        iosArm64("ios")
+        iosArm64()
     } else {
-        iosX64("ios")
+        iosX64()
     }
 
     tvos()
diff --git a/uri/build.gradle.kts b/uri/build.gradle.kts
index f17fedd..b6f4a7a 100755
--- a/uri/build.gradle.kts
+++ b/uri/build.gradle.kts
@@ -15,9 +15,9 @@ kotlin {
 
     val onPhone = System.getenv("SDK_NAME")?.startsWith("iphoneos") ?: false
     if (onPhone) {
-        iosArm64("ios")
+        iosArm64()
     } else {
-        iosX64("ios")
+        iosX64()
     }
 
     tvos()

From ddd4b3cf57e77d0ac265a78664888252cf2142d4 Mon Sep 17 00:00:00 2001
From: Michael Olmsted <molmsted98@gmail.com>
Date: Fri, 9 Jul 2021 17:30:35 -0400
Subject: [PATCH 37/39] Bump version number

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index ce9c348..dc6032b 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,7 +4,7 @@ kotlin.mpp.enableGranularSourceSetsMetadata=true
 kotlin.mpp.enableCompatibilityMetadataVariant=true
 
 GROUP=com.github.molmsted98.max
-VERSION_NAME=1.0.30
+VERSION_NAME=1.0.31
 
 POM_INCEPTION_YEAR=2021
 

From 88261287d5df5697d2c557bde28c75b46b3c217a Mon Sep 17 00:00:00 2001
From: Michael Olmsted <molmsted98@gmail.com>
Date: Fri, 9 Jul 2021 18:08:04 -0400
Subject: [PATCH 38/39] Revert ios targets

---
 gradle.properties          | 2 +-
 matcher/build.gradle.kts   | 8 +-------
 navigator/build.gradle.kts | 8 +-------
 router/build.gradle.kts    | 8 +-------
 uri/build.gradle.kts       | 8 +-------
 5 files changed, 5 insertions(+), 29 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index dc6032b..033d5cc 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,7 +4,7 @@ kotlin.mpp.enableGranularSourceSetsMetadata=true
 kotlin.mpp.enableCompatibilityMetadataVariant=true
 
 GROUP=com.github.molmsted98.max
-VERSION_NAME=1.0.31
+VERSION_NAME=1.0.32
 
 POM_INCEPTION_YEAR=2021
 
diff --git a/matcher/build.gradle.kts b/matcher/build.gradle.kts
index b6f4a7a..a3a1ef1 100755
--- a/matcher/build.gradle.kts
+++ b/matcher/build.gradle.kts
@@ -13,13 +13,7 @@ kotlin {
         nodejs()
     }
 
-    val onPhone = System.getenv("SDK_NAME")?.startsWith("iphoneos") ?: false
-    if (onPhone) {
-        iosArm64()
-    } else {
-        iosX64()
-    }
-
+    ios()
     tvos()
     watchos()
 
diff --git a/navigator/build.gradle.kts b/navigator/build.gradle.kts
index 2a05b2e..159ca95 100755
--- a/navigator/build.gradle.kts
+++ b/navigator/build.gradle.kts
@@ -13,13 +13,7 @@ kotlin {
         nodejs()
     }
 
-    val onPhone = System.getenv("SDK_NAME")?.startsWith("iphoneos") ?: false
-    if (onPhone) {
-        iosArm64()
-    } else {
-        iosX64()
-    }
-
+    ios()
     tvos()
     watchos()
 
diff --git a/router/build.gradle.kts b/router/build.gradle.kts
index 7598c15..31801d4 100755
--- a/router/build.gradle.kts
+++ b/router/build.gradle.kts
@@ -13,13 +13,7 @@ kotlin {
         nodejs()
     }
 
-    val onPhone = System.getenv("SDK_NAME")?.startsWith("iphoneos") ?: false
-    if (onPhone) {
-        iosArm64()
-    } else {
-        iosX64()
-    }
-
+    ios()
     tvos()
     watchos()
 
diff --git a/uri/build.gradle.kts b/uri/build.gradle.kts
index b6f4a7a..a3a1ef1 100755
--- a/uri/build.gradle.kts
+++ b/uri/build.gradle.kts
@@ -13,13 +13,7 @@ kotlin {
         nodejs()
     }
 
-    val onPhone = System.getenv("SDK_NAME")?.startsWith("iphoneos") ?: false
-    if (onPhone) {
-        iosArm64()
-    } else {
-        iosX64()
-    }
-
+    ios()
     tvos()
     watchos()
 

From bcbc79b19f5badbd9ee7bd011a4fb067e46aeb0a Mon Sep 17 00:00:00 2001
From: Michael Olmsted <molmsted98@gmail.com>
Date: Sat, 7 Aug 2021 13:32:19 -0400
Subject: [PATCH 39/39] Update to Kotlin 1.5.21

---
 buildSrc/src/main/kotlin/deps/deps.kt | 2 +-
 gradle.properties                     | 2 +-
 gradle/gradle-mvn-mpp-push.gradle     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/buildSrc/src/main/kotlin/deps/deps.kt b/buildSrc/src/main/kotlin/deps/deps.kt
index 94efdc0..d19f152 100644
--- a/buildSrc/src/main/kotlin/deps/deps.kt
+++ b/buildSrc/src/main/kotlin/deps/deps.kt
@@ -6,7 +6,7 @@ object Dokka : Group("org.jetbrains.dokka", "0.10.1") {
     }
 }
 
-object Kotlin : Group("org.jetbrains.kotlin", "1.5.20") {
+object Kotlin : Group("org.jetbrains.kotlin", "1.5.21") {
     val StdLib = artifact("kotlin-stdlib")
 
     object Gradle {
diff --git a/gradle.properties b/gradle.properties
index 033d5cc..5eacbc7 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,7 +4,7 @@ kotlin.mpp.enableGranularSourceSetsMetadata=true
 kotlin.mpp.enableCompatibilityMetadataVariant=true
 
 GROUP=com.github.molmsted98.max
-VERSION_NAME=1.0.32
+VERSION_NAME=1.0.33
 
 POM_INCEPTION_YEAR=2021
 
diff --git a/gradle/gradle-mvn-mpp-push.gradle b/gradle/gradle-mvn-mpp-push.gradle
index 32157dd..4ef6b57 100644
--- a/gradle/gradle-mvn-mpp-push.gradle
+++ b/gradle/gradle-mvn-mpp-push.gradle
@@ -1,7 +1,7 @@
 apply plugin: 'java-gradle-plugin'
 apply plugin: 'maven-publish'
 
-def selectArtifactId(project, type, defaultName) {
+static def selectArtifactId(project, type, defaultName) {
     def name = project.name
     def isCommon = project.ext.has("commonStructure")
     def commonIsRoot = project.ext.has("commonStructure") && project.ext.commonStructure