chore(deps): update dependency gradle to v7.6.4

AniTrend · Jul 24, 2024 · 4241a7c · 4241a7c
1 parent c40af19
commit 4241a7c
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 59 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,10 +1,3 @@
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
-import com.github.benmanes.gradle.versions.updates.DependencyUpdatesTask
-
-plugins {
-    id("com.github.ben-manes.versions")
-}
-
 buildscript {
     repositories {
         google()
@@ -46,30 +39,6 @@ tasks {
     }
 }
 
-tasks.named(
-    "dependencyUpdates",
-    DependencyUpdatesTask::class.java
-).configure {
-    checkForGradleUpdate = false
-    outputFormatter = "json"
-    outputDir = "build/dependencyUpdates"
-    reportfileName = "report"
-    resolutionStrategy {
-        componentSelection {
-            all {
-                val reject = listOf("preview", "alpha", "beta", "m")
-                    .map { qualifier ->
-                        val pattern = "(?i).*[.-]$qualifier[.\\d-]*"
-                        Regex(pattern, RegexOption.IGNORE_CASE)
-                    }
-                    .any { it.matches(candidate.version) }
-                if (reject)
-                    reject("Preview releases not wanted")
-            }
-        }
-    }
-}
-
 fun Configuration.handleConflicts(project: Project): Unit = with(project) {
     resolutionStrategy.eachDependency {
         when (requested.group) {

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -1,14 +1,10 @@
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-import org.jetbrains.kotlin.gradle.dsl.KotlinJvmCompile
-
 plugins {
     `kotlin-dsl`
     `version-catalog`
 }
 
 repositories {
     google()
-    jcenter()
     mavenCentral()
     gradlePluginPortal()
     maven {
@@ -19,32 +15,12 @@ repositories {
     }
 }
 
-tasks.withType(KotlinCompile::class) {
-    sourceCompatibility = "11"
-    targetCompatibility = "11"
-}
-
-tasks.withType(KotlinJvmCompile::class) {
-    kotlinOptions {
-        jvmTarget = "11"
-    }
-}
-
-fun Project.library(alias: String) =
-    extensions.getByType<VersionCatalogsExtension>()
-        .named("libs")
-        .findLibrary(alias)
-        .get()
-
 dependencies {
     /* Depend on the android gradle plugin, since we want to access it in our plugin */
-    implementation(library("android-gradle-plugin"))
+    implementation(libs.android.gradle.plugin)
 
     /* Depend on the kotlin plugin, since we want to access it in our plugin */
-    implementation(library("jetbrains-kotlin-gradle"))
-
-    /** Dependency management */
-    implementation(library("gradle-versions"))
+    implementation(libs.jetbrains.kotlin.gradle)
 
     /* Depend on the default Gradle API's since we want to build a custom plugin */
     implementation(gradleApi())

diff --git a/buildSrc/src/main/java/com/mxt/anitrend/buildsrc/components/PluginComponents.kt b/buildSrc/src/main/java/com/mxt/anitrend/buildsrc/components/PluginComponents.kt
@@ -12,7 +12,6 @@ internal fun Project.configurePlugins() {
     plugins.apply("io.objectbox")
 }
 
-@Suppress("UnstableApiUsage")
 internal fun Project.configureAdditionalPlugins() {
     baseExtension().variantFilter {
         if (flavors.first().name == "app") {

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.4-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists