diff --git a/build-logic/settings.gradle.kts b/build-logic/settings.gradle.kts index 54fd3070..73c7348f 100644 --- a/build-logic/settings.gradle.kts +++ b/build-logic/settings.gradle.kts @@ -1,10 +1,11 @@ -pluginManagement { - repositories { - google() - mavenCentral() - gradlePluginPortal() - } -} +/* + * Copyright © 2014-2021 The Android Password Store Authors. All Rights Reserved. + * SPDX-License-Identifier: GPL-3.0-only + */ + +rootProject.name = "build-logic" + +enableFeaturePreview("VERSION_CATALOGS") dependencyResolutionManagement { repositories { @@ -14,10 +15,6 @@ dependencyResolutionManagement { versionCatalogs { create("libs") { from(files("../gradle/libs.versions.toml")) } } } -rootProject.name = "build-logic" - -enableFeaturePreview("VERSION_CATALOGS") - include("android-plugins") include("automation-plugins") diff --git a/settings.gradle.kts b/settings.gradle.kts index d2dbc8ed..58682180 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -3,33 +3,14 @@ * SPDX-License-Identifier: GPL-3.0-only */ -// Modules -include(":app") - -include(":autofill-parser") - -include(":crypto-common") - -include(":crypto-pgpainless") - -include(":format-common") - -include(":openpgp-ktx") - -include(":dependency-sync") - -// Experimental features -enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS") - -enableFeaturePreview("VERSION_CATALOGS") - // Plugin repositories pluginManagement { repositories { + includeBuild("build-logic") + google() mavenCentral() gradlePluginPortal() } - includeBuild("build-logic") } dependencyResolutionManagement { @@ -46,3 +27,23 @@ dependencyResolutionManagement { } } } + +// Experimental features +enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS") + +enableFeaturePreview("VERSION_CATALOGS") + +// Modules +include("app") + +include("autofill-parser") + +include("crypto-common") + +include("crypto-pgpainless") + +include("format-common") + +include("openpgp-ktx") + +include(":dependency-sync")