From 281c6388caa48e5d44a14605ea7e3547b8ec33c8 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Wed, 11 Jul 2018 22:54:30 -0700
Subject: [PATCH] Reimplemented SortedProperty with fix for Java > 8.

---
 .../erik/gradle/semver/SemverPlugin.kt        |  2 +-
 .../erik/gradle/semver/SortedProperties.kt    | 47 +++++++++++++++++++
 2 files changed, 48 insertions(+), 1 deletion(-)
 create mode 100644 src/main/kotlin/net/thauvin/erik/gradle/semver/SortedProperties.kt

diff --git a/src/main/kotlin/net/thauvin/erik/gradle/semver/SemverPlugin.kt b/src/main/kotlin/net/thauvin/erik/gradle/semver/SemverPlugin.kt
index f54e32f..74cf27f 100644
--- a/src/main/kotlin/net/thauvin/erik/gradle/semver/SemverPlugin.kt
+++ b/src/main/kotlin/net/thauvin/erik/gradle/semver/SemverPlugin.kt
@@ -47,7 +47,7 @@ class SemverPlugin : Plugin<Project> {
 
     companion object {
         fun saveProperties(config: SemverConfig, version: Version) {
-            Properties().apply {
+            SortedProperties().apply {
                 put(config.majorKey, version.major)
                 put(config.minorKey, version.minor)
                 put(config.patchKey, version.patch)
diff --git a/src/main/kotlin/net/thauvin/erik/gradle/semver/SortedProperties.kt b/src/main/kotlin/net/thauvin/erik/gradle/semver/SortedProperties.kt
new file mode 100644
index 0000000..0ceb358
--- /dev/null
+++ b/src/main/kotlin/net/thauvin/erik/gradle/semver/SortedProperties.kt
@@ -0,0 +1,47 @@
+/*
+ * SortedProperties.kt
+ *
+ * Copyright (c) 2018, Erik C. Thauvin (erik@thauvin.net)
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ *   Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ *   Neither the name of this project nor the names of its contributors may be
+ *   used to endorse or promote products derived from this software without
+ *   specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package net.thauvin.erik.gradle.semver
+
+import java.util.Collections
+import java.util.Enumeration
+import java.util.Properties
+
+internal class SortedProperties : Properties() {
+    override val entries: MutableSet<MutableMap.MutableEntry<Any, Any>>
+        get() = super.entries.sortedWith(Comparator { a, b -> a.toString().compareTo(b.toString()) }).toMutableSet()
+
+    override fun keys(): Enumeration<Any> {
+        val keys = Collections.list(super.keys())
+        keys.sortWith(Comparator { a, b -> a.toString().compareTo(b.toString()) })
+        return Collections.enumeration(keys)
+    }
+}