Updated version number to 3.1.2 to avoid conflicts with Kotlin-Footwe…

…tting branch (that artifact has also been renamed AND renumbered to prevent future conflicts).

CHANGE_LOG.md

@@ -5,15 +5,19 @@ releases on the way from an old version to a new one.  Fix any deprecation warni
 release before upgrading to the next one.  The documentation next to each Deprecated annotation
 tells you what to use instead.  Once we delete the deprecated methods, that documentation goes too.
 
-# Release 3.1.1: Heterogeneous RrbTree Fix
+# Release 3.1.2: Heterogeneous RrbTree Fix
  - Fixed a bug (reported by fcurts - with unit test!) where Heterogeneous RrbTrees of more than 32 items
  would throw an exception at Runtime.  I had done something that in retrospect is obviously dumb.
  - Documented Cowry (Copy-On Write aRraY) better.
   These are type-safe utility methods for dealing with arrays.
  This project still aims to keep you from needing to deal with arrays, but sometimes you do, and it's handy to have copy-on-write routines for doing it.
  More of these methods could be made public if they are needed.
 
-# Release 3.1.0: Map.keyIterator() and .valIterator()
+##### Release 3.1.1: SKIPPED
+ - This was an accidental release number where the Kotlin-Friendly branch ended up having the same release
+ number as the Master branch.  Kotlin-Friendly Paguro is now called Paguro-KF and starts with version 3.5.x.
+
+## Release 3.1.0: Map.keyIterator() and .valIterator()
  - [Nate Austin](https://github.com/navision)'s memory-efficient iteration of just keys or just values from maps.  Thank you Nate!
 
 # Release 3.0.19: RRB Tree Split Bounds

README.md

@@ -1,5 +1,10 @@
 Type-safe versions of Clojure's immutable/persistent collections, an immutable alternative to Java 8 Streams, and other tools to make functional programming in Java easier.
 
+# Classic
+You are on the Paguro Classic, or main branch of this project.
+If you work with a mix of Java and Kotlin files, you may wish to try Paguro-KF 3.5.x in the `2017-09-17b_KotlinFootWetting` branch.
+If you want to live dangerously, try the all-Kotlin version in the 4.0 branch when it becomes available.
+
 ![Hermit Crab](https://c7.staticflickr.com/8/7413/12171498934_2934c7ef28_n.jpg)
 Photo by [Rushen](https://www.flickr.com/photos/rushen/12171498934/in/photostream/)
 
@@ -49,13 +54,13 @@ Paguro takes advantage of Java's type inferencing.  It eschews void return types
 Available from the [Maven Repository](http://mvnrepository.com/artifact/org.organicdesign/Paguro) as:
 ```xml
 <!--
-If you're using Kotlin and Java, you want the 3.1 version in the KotlinFootWetting branch.
-Java-only users want 3.0 from the main branch.
+If you're using Kotlin and Java, you want the 3.5 version in the KotlinFootWetting branch.
+Java-only users want 3.x from the main branch.
  -->
 <dependency>
         <groupId>org.organicdesign</groupId>
         <artifactId>Paguro</artifactId>
-        <version>3.1.1</version>
+        <version>3.1.2</version>
 </dependency>
 ```
 

pom.xml

@@ -38,7 +38,7 @@ http://mvnrepository.com/artifact/org.organicdesign/Paguro
 	-->
 	<groupId>org.organicdesign</groupId>
 	<artifactId>Paguro</artifactId>
-	<version>3.1.1</version>
+	<version>3.1.2</version>
 	<packaging>jar</packaging>
 
 	<name>Paguro</name>