diff --git a/build.gradle.kts b/build.gradle.kts index 5738e6afb0..7d4a1fd881 100755 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,14 +1,12 @@ /* * Copyright (c) 2020 Mustafa Ozhan. All rights reserved. */ -import com.github.benmanes.gradle.versions.updates.DependencyUpdatesTask import io.gitlab.arturbosch.detekt.Detekt import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { @Suppress("DSL_SCOPE_VIOLATION") libs.plugins.apply { - alias(dependencyUpdates) alias(kover) alias(detekt) alias(sonarqube) @@ -92,8 +90,3 @@ allprojects { } } } - -tasks.withType { - gradleReleaseChannel = "current" - rejectVersionIf { candidate.version.isNonStable() } -} diff --git a/buildSrc/src/main/kotlin/Extensions.kt b/buildSrc/src/main/kotlin/SecretExt.kt similarity index 64% rename from buildSrc/src/main/kotlin/Extensions.kt rename to buildSrc/src/main/kotlin/SecretExt.kt index 63e7507263..281161c4d8 100644 --- a/buildSrc/src/main/kotlin/Extensions.kt +++ b/buildSrc/src/main/kotlin/SecretExt.kt @@ -1,6 +1,5 @@ import org.gradle.api.Project import java.io.IOException -import java.util.Locale import java.util.Properties private const val PATH_SECRET_PROPERTIES = "../secret.properties" @@ -22,17 +21,3 @@ private fun Project.getSecretProperties() = try { logger.debug(e.message, e) null } - -fun String.isNonStable(): Boolean { - val stableKeyword = listOf( - "RELEASE", - "FINAL", - "GA" - ).any { - this.toUpperCase(Locale.ROOT).contains(it) - } - - val regex = "^[0-9,.v-]+(-r)?$".toRegex() - val isStable = stableKeyword || regex.matches(this) - return isStable.not() -} diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 4753057f31..427874f730 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -33,7 +33,6 @@ leakCanary = "2.10" sqlDelight = "1.5.4" lifecycle = "2.5.1" mokoResources = "0.20.1" -dependencyUpdates = "0.44.0" buildKonfig = "0.13.3" workRuntime = "2.7.1" splashScreen = "1.0.0" @@ -140,7 +139,6 @@ firebasePerPlugin = { id = "com.google.firebase.firebase-perf" } kotlinXSerialization = { id = "kotlinx-serialization" } sqlDelight = { id = "com.squareup.sqldelight" } mokoResources = { id = "dev.icerock.mobile.multiplatform-resources" } -dependencyUpdates = { id = "com.github.ben-manes.versions", version.ref = "dependencyUpdates" } kover = { id = "org.jetbrains.kotlinx.kover", version.ref = "kover" } ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" } detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt" } diff --git a/submodule/basemob b/submodule/basemob index 6678af72dd..b6aa728f93 160000 --- a/submodule/basemob +++ b/submodule/basemob @@ -1 +1 @@ -Subproject commit 6678af72dde6235ddcc2343771e70af58f41aa16 +Subproject commit b6aa728f93d09b4beed3741f671a6ad86d6f0e6f diff --git a/submodule/logmob b/submodule/logmob index 212f79d4ee..0b95cc4f64 160000 --- a/submodule/logmob +++ b/submodule/logmob @@ -1 +1 @@ -Subproject commit 212f79d4ee6fa650c4b257b46c0158dc6a472a19 +Subproject commit 0b95cc4f64bf3eb1b5eeb7d951ca95e461e4f0ff diff --git a/submodule/parsermob b/submodule/parsermob index d5fd04cb4c..d7b5dacac5 160000 --- a/submodule/parsermob +++ b/submodule/parsermob @@ -1 +1 @@ -Subproject commit d5fd04cb4cd1443fc06586dbd17a98098fdc20c7 +Subproject commit d7b5dacac51d107cdefac8699ef2d6881902e466 diff --git a/submodule/scopemob b/submodule/scopemob index 520d97b5e8..1f37857e0a 160000 --- a/submodule/scopemob +++ b/submodule/scopemob @@ -1 +1 @@ -Subproject commit 520d97b5e860a6e0fa3f6e10a3e88e901ce2589f +Subproject commit 1f37857e0ac5ecb68d765bf774bd458464c408a3