🔀 Merge branch “release-80”

diff --git a/build.gradle b/build.gradle
index 01832fb..0beb42a 100644 (file)
--- a/build.gradle
+++ b/build.gradle
@@ -1,5 +1,5 @@
 group = 'net.pterodactylus'
-version = '79'
+version = '80'
 
 buildscript {
     ext.kotlinVersion = '1.2.71'

diff --git a/src/main/java/net/pterodactylus/sone/main/SonePlugin.java b/src/main/java/net/pterodactylus/sone/main/SonePlugin.java
index 649ebf6..ceb336b 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/main/SonePlugin.java
+++ b/src/main/java/net/pterodactylus/sone/main/SonePlugin.java
@@ -124,7 +124,7 @@ public class SonePlugin implements FredPlugin, FredPluginFCP, FredPluginL10n, Fr
        /** The current year at time of release. */
        private static final int YEAR = 2019;
        private static final String SONE_HOMEPAGE = "USK@nwa8lHa271k2QvJ8aa0Ov7IHAV-DFOCFgmDt3X6BpCI,DuQSUZiI~agF8c-6tjsFFGuZ8eICrzWCILB60nT8KKo,AQACAAE/sone/";
-       private static final int LATEST_EDITION = 78;
+       private static final int LATEST_EDITION = 79;
 
        /** The logger. */
        private static final Logger logger = getLogger(SonePlugin.class.getName());
@@ -255,7 +255,7 @@ public class SonePlugin implements FredPlugin, FredPluginFCP, FredPluginL10n, Fr
                                bind(Context.class).toInstance(context);
                                bind(getOptionalContextTypeLiteral()).toInstance(of(context));
                                bind(SonePlugin.class).toInstance(SonePlugin.this);
-                               bind(Version.class).toInstance(Version.parse(getVersion()));
+                               bind(Version.class).toInstance(Version.parse(getVersion().substring(1)));
                                bind(PluginVersion.class).toInstance(new PluginVersion(getVersion()));
                                bind(PluginYear.class).toInstance(new PluginYear(getYear()));
                                bind(PluginHomepage.class).toInstance(new PluginHomepage(getHomepage()));

diff --git a/src/test/kotlin/net/pterodactylus/sone/main/VersionParserTest.kt b/src/test/kotlin/net/pterodactylus/sone/main/VersionParserTest.kt
index f1702ce..fbf1584 100644 (file)
--- a/src/test/kotlin/net/pterodactylus/sone/main/VersionParserTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/main/VersionParserTest.kt
@@ -25,15 +25,15 @@ class VersionParserTest {
        @Test
        fun `default version file is parsed`() {
                val version = parseVersion()!!
-               assertThat(version.id, equalTo("43f3e1c3a0f487e37e5851a2cc72756d271c7571"))
-               assertThat(version.nice, equalTo("0.9.6-466-g43f3e1c"))
+               assertThat(version.id, equalTo("73241df664f676482d8ca2c13b03d3deac3eacba"))
+               assertThat(version.nice, equalTo("v79-2-g73241df6"))
        }
 
        @Test
        fun `parsed version is created correctly`() {
                val version = parsedVersion!!
-               assertThat(version.id, equalTo("43f3e1c3a0f487e37e5851a2cc72756d271c7571"))
-               assertThat(version.nice, equalTo("0.9.6-466-g43f3e1c"))
+               assertThat(version.id, equalTo("73241df664f676482d8ca2c13b03d3deac3eacba"))
+               assertThat(version.nice, equalTo("v79-2-g73241df6"))
        }
 
 }

diff --git a/src/test/resources/version.yaml b/src/test/resources/version.yaml
index 22023b5..1b8dec2 100644 (file)
--- a/src/test/resources/version.yaml
+++ b/src/test/resources/version.yaml
@@ -1,2 +1,2 @@
-id: 43f3e1c3a0f487e37e5851a2cc72756d271c7571
-nice: 0.9.6-466-g43f3e1c
+id: 73241df664f676482d8ca2c13b03d3deac3eacba
+nice: v79-2-g73241df6