diff options
| -rw-r--r-- | build-logic/automation-plugins/src/main/kotlin/com.github.android-password-store.gradle.gradle.kts | 12 | ||||
| -rw-r--r-- | build-logic/settings.gradle.kts | 2 | ||||
| -rw-r--r-- | build.gradle.kts | 1 | ||||
| -rw-r--r-- | gradle/wrapper/gradle-wrapper.properties | 4 | ||||
| -rw-r--r-- | settings.gradle.kts | 2 |
5 files changed, 2 insertions, 19 deletions
diff --git a/build-logic/automation-plugins/src/main/kotlin/com.github.android-password-store.gradle.gradle.kts b/build-logic/automation-plugins/src/main/kotlin/com.github.android-password-store.gradle.gradle.kts deleted file mode 100644 index bbaa8505..00000000 --- a/build-logic/automation-plugins/src/main/kotlin/com.github.android-password-store.gradle.gradle.kts +++ /dev/null @@ -1,12 +0,0 @@ -/* - * Copyright © 2014-2021 The Android Password Store Authors. All Rights Reserved. - * SPDX-License-Identifier: GPL-3.0-only - */ - -import org.gradle.api.tasks.wrapper.Wrapper -import org.gradle.kotlin.dsl.withType - -tasks.withType<Wrapper> { - gradleVersion = "7.4-rc-2" - distributionSha256Sum = "21491c9f0656e1529ccb39cbd587d01c33ba00d25f994b10240748ed0d45894a" -} diff --git a/build-logic/settings.gradle.kts b/build-logic/settings.gradle.kts index 73c7348f..dc8e13b2 100644 --- a/build-logic/settings.gradle.kts +++ b/build-logic/settings.gradle.kts @@ -5,8 +5,6 @@ rootProject.name = "build-logic" -enableFeaturePreview("VERSION_CATALOGS") - dependencyResolutionManagement { repositories { google() diff --git a/build.gradle.kts b/build.gradle.kts index e44d8c2b..8f14bbc6 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -12,6 +12,5 @@ plugins { id("com.github.android-password-store.kotlin-common") id("com.github.android-password-store.binary-compatibility") id("com.github.android-password-store.git-hooks") - id("com.github.android-password-store.gradle") id("com.github.android-password-store.spotless") } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 762b15f9..1debed0d 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=21491c9f0656e1529ccb39cbd587d01c33ba00d25f994b10240748ed0d45894a -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-rc-2-bin.zip +distributionSha256Sum=8cc27038d5dbd815759851ba53e70cf62e481b87494cc97cfd97982ada5ba634 +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/settings.gradle.kts b/settings.gradle.kts index b0c71a9f..e0ab512d 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -33,8 +33,6 @@ dependencyResolutionManagement { // Experimental features enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS") -enableFeaturePreview("VERSION_CATALOGS") - // Modules include("app") |