Update gradle and app version

This commit is contained in:
Koitharu
2022-05-15 16:36:08 +03:00
parent 0dc4e63b7a
commit 5abf5d3367
4 changed files with 22 additions and 21 deletions

View File

@@ -14,8 +14,8 @@ android {
applicationId 'org.koitharu.kotatsu' applicationId 'org.koitharu.kotatsu'
minSdkVersion 21 minSdkVersion 21
targetSdkVersion 32 targetSdkVersion 32
versionCode 407 versionCode 408
versionName '3.2.3' versionName '3.3-beta1'
generatedDensities = [] generatedDensities = []
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

View File

@@ -1,50 +1,52 @@
package org.koitharu.kotatsu.core.github package org.koitharu.kotatsu.core.github
import org.junit.Assert.assertEquals
import org.junit.Assert.assertTrue
import org.junit.Test import org.junit.Test
import org.koitharu.kotatsu.BuildConfig import org.koitharu.kotatsu.BuildConfig
import kotlin.test.assertEquals
import kotlin.test.assertTrue
class VersionIdTest { class VersionIdTest {
@Test @Test
fun testVersionIdParse() { fun testVersionIdParse() {
val version = VersionId.parse("2.0") val version = VersionId("2.0")
assertEquals(version.major, 2) assertEquals(version.major, 2)
assertEquals(version.minor,0) assertEquals(version.minor, 0)
assertEquals(version.build,0) assertEquals(version.build, 0)
assertEquals(version.variantType, "") assertEquals(version.variantType, "")
assertEquals(version.variantNumber,0) assertEquals(version.variantNumber, 0)
} }
@Test @Test
fun testVersionIdVariantParse() { fun testVersionIdVariantParse() {
val version = VersionId.parse("2.0.1-b1") val version = VersionId("2.0.1-b1")
assertEquals(version.major, 2) assertEquals(version.major, 2)
assertEquals(version.minor, 0) assertEquals(version.minor, 0)
assertEquals(version.build, 1) assertEquals(version.build, 1)
assertEquals(version.variantType, "b") assertEquals(version.variantType, "b")
assertEquals(version.variantNumber, 1) assertEquals(version.variantNumber, 1)
val version2 = VersionId("2.0.1-beta1")
assertEquals(compareValues(version, version2), 0)
} }
@Test @Test
fun testVersionIdCompare() { fun testVersionIdCompare() {
val version1 = VersionId.parse("1.99.99") val version1 = VersionId("1.99.99")
val version2 = VersionId.parse("2.0.0") val version2 = VersionId("2.0.0")
assertTrue(version1 < version2) assertTrue(version1 < version2)
} }
@Test @Test
fun testVersionIdVariantCompare() { fun testVersionIdVariantCompare() {
val version1 = VersionId.parse("2.0.1-a2") val version1 = VersionId("2.0.1-a2")
val version2 = VersionId.parse("2.0.1-b1") val version2 = VersionId("2.0.1-b1")
assertTrue(version1 < version2) assertTrue(version1 < version2)
} }
@Test @Test
fun testCurrentVersion() { fun testCurrentVersion() {
val version1 = VersionId.parse("2.4.6") val version1 = VersionId("2.4.6")
val version2 = VersionId.parse(BuildConfig.VERSION_NAME) val version2 = VersionId(BuildConfig.VERSION_NAME)
assertTrue(version1 < version2) assertTrue(version1 < version2)
} }
} }

View File

@@ -5,8 +5,8 @@ buildscript {
mavenCentral() mavenCentral()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:7.1.2' classpath 'com.android.tools.build:gradle:7.2.0'
classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.20-M1' classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.21'
// NOTE: Do not place your application dependencies here; they belong // NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files // in the individual module build.gradle files

View File

@@ -1,8 +1,7 @@
#Mon Sep 13 08:29:18 EEST 2021 #Sun May 15 16:26:09 EEST 2022
distributionBase=GRADLE_USER_HOME 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 distributionPath=wrapper/dists
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
# https://gradle.org/release-checksums/ distributionSha256Sum=29e49b10984e585d8118b7d0bc452f944e386458df27371b49b4ac1dec4b7fda
distributionSha256Sum=f581709a9c35e9cb92e16f585d2c4bc99b2b1a5f85d2badbd3dc6bff59e1e6dd