From 5abf5d3367a574c2116c28bb5f580ef9772b74e4 Mon Sep 17 00:00:00 2001
From: Koitharu <nvasya95@gmail.com>
Date: Sun, 15 May 2022 16:36:08 +0300
Subject: [PATCH] Update gradle and app version

---
 app/build.gradle                              |  4 +--
 .../kotatsu/core/github/VersionIdTest.kt      | 28 ++++++++++---------
 build.gradle                                  |  4 +--
 gradle/wrapper/gradle-wrapper.properties      |  7 ++---
 4 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index e7442c75e..e81717951 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -14,8 +14,8 @@ android {
 		applicationId 'org.koitharu.kotatsu'
 		minSdkVersion 21
 		targetSdkVersion 32
-		versionCode 407
-		versionName '3.2.3'
+		versionCode 408
+		versionName '3.3-beta1'
 		generatedDensities = []
 		testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
diff --git a/app/src/test/java/org/koitharu/kotatsu/core/github/VersionIdTest.kt b/app/src/test/java/org/koitharu/kotatsu/core/github/VersionIdTest.kt
index 9f83e85a6..45b41446e 100644
--- a/app/src/test/java/org/koitharu/kotatsu/core/github/VersionIdTest.kt
+++ b/app/src/test/java/org/koitharu/kotatsu/core/github/VersionIdTest.kt
@@ -1,50 +1,52 @@
 package org.koitharu.kotatsu.core.github
 
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertTrue
 import org.junit.Test
 import org.koitharu.kotatsu.BuildConfig
-import kotlin.test.assertEquals
-import kotlin.test.assertTrue
 
 class VersionIdTest {
 
 	@Test
 	fun testVersionIdParse() {
-		val version = VersionId.parse("2.0")
+		val version = VersionId("2.0")
 		assertEquals(version.major, 2)
-		assertEquals(version.minor,0)
-		assertEquals(version.build,0)
+		assertEquals(version.minor, 0)
+		assertEquals(version.build, 0)
 		assertEquals(version.variantType, "")
-		assertEquals(version.variantNumber,0)
+		assertEquals(version.variantNumber, 0)
 	}
 
 	@Test
 	fun testVersionIdVariantParse() {
-		val version = VersionId.parse("2.0.1-b1")
+		val version = VersionId("2.0.1-b1")
 		assertEquals(version.major, 2)
 		assertEquals(version.minor, 0)
 		assertEquals(version.build, 1)
 		assertEquals(version.variantType, "b")
 		assertEquals(version.variantNumber, 1)
+		val version2 = VersionId("2.0.1-beta1")
+		assertEquals(compareValues(version, version2), 0)
 	}
 
 	@Test
 	fun testVersionIdCompare() {
-		val version1 = VersionId.parse("1.99.99")
-		val version2 = VersionId.parse("2.0.0")
+		val version1 = VersionId("1.99.99")
+		val version2 = VersionId("2.0.0")
 		assertTrue(version1 < version2)
 	}
 	
 	@Test
 	fun testVersionIdVariantCompare() {
-		val version1 = VersionId.parse("2.0.1-a2")
-		val version2 = VersionId.parse("2.0.1-b1")
+		val version1 = VersionId("2.0.1-a2")
+		val version2 = VersionId("2.0.1-b1")
 		assertTrue(version1 < version2)
 	}
 
 	@Test
 	fun testCurrentVersion() {
-		val version1 = VersionId.parse("2.4.6")
-		val version2 = VersionId.parse(BuildConfig.VERSION_NAME)
+		val version1 = VersionId("2.4.6")
+		val version2 = VersionId(BuildConfig.VERSION_NAME)
 		assertTrue(version1 < version2)
 	}
 }
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 390d5748a..f885d7072 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,8 +5,8 @@ buildscript {
 		mavenCentral()
 	}
 	dependencies {
-		classpath 'com.android.tools.build:gradle:7.1.2'
-		classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.20-M1'
+		classpath 'com.android.tools.build:gradle:7.2.0'
+		classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.21'
 
 		// NOTE: Do not place your application dependencies here; they belong
 		// in the individual module build.gradle files
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index d4ad160ac..26b7873ed 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,8 +1,7 @@
-#Mon Sep 13 08:29:18 EEST 2021
+#Sun May 15 16:26:09 EEST 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
-# https://gradle.org/release-checksums/
-distributionSha256Sum=f581709a9c35e9cb92e16f585d2c4bc99b2b1a5f85d2badbd3dc6bff59e1e6dd
+distributionSha256Sum=29e49b10984e585d8118b7d0bc452f944e386458df27371b49b4ac1dec4b7fda