Skip to content

Commit

Permalink
Move plugin versions from version catalog to buildscript.dependencies (
Browse files Browse the repository at this point in the history
  • Loading branch information
illarionov authored Mar 17, 2024
1 parent 7f57084 commit 89f684b
Show file tree
Hide file tree
Showing 8 changed files with 70 additions and 73 deletions.
60 changes: 0 additions & 60 deletions gradle/libs.versions.toml

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
/*
* Copyright (c) 2023, the Pixnews project authors and contributors. Please see the AUTHORS file for details.
* Copyright (c) 2024, the Pixnews project authors and contributors. Please see the AUTHORS file for details.
* Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
*/
plugins {
id("org.gradlex.build-parameters") version "1.4.3"
id("org.gradlex.build-parameters")
}

group = "ru.pixnews.gradle.base"
Expand Down
13 changes: 12 additions & 1 deletion gradle/plugin/base/build-parameters/settings.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,11 +1,22 @@
/*
* Copyright (c) 2023, the Pixnews project authors and contributors. Please see the AUTHORS file for details.
* Copyright (c) 2023-2024, the Pixnews project authors and contributors. Please see the AUTHORS file for details.
* Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
*/
dependencyResolutionManagement {
@Suppress("UnstableApiUsage")
repositories.gradlePluginPortal()
}

// Workaround for https://github.com/gradle/gradle/issues/26020
buildscript {
repositories {
mavenCentral()
gradlePluginPortal()
}
dependencies {
classpath("org.gradlex:build-parameters:1.4.3")
}
}

rootProject.name = "gradle-build-parameters"
rootProject.buildFileName = "build-parameters.gradle.kts"
13 changes: 12 additions & 1 deletion gradle/plugin/base/kotlindsl/settings.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,11 +1,22 @@
/*
* Copyright (c) 2023, the Pixnews project authors and contributors. Please see the AUTHORS file for details.
* Copyright (c) 2023-2024, the Pixnews project authors and contributors. Please see the AUTHORS file for details.
* Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
*/
dependencyResolutionManagement {
@Suppress("UnstableApiUsage")
repositories.gradlePluginPortal()
}

// Workaround for https://github.com/gradle/gradle/issues/26020
buildscript {
repositories {
mavenCentral()
gradlePluginPortal()
}
dependencies {
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$embeddedKotlinVersion")
}
}

rootProject.name = "gradle-kotlindsl"
rootProject.buildFileName = "kotlindsl.gradle.kts"
11 changes: 11 additions & 0 deletions gradle/plugin/project/settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,17 @@ dependencyResolutionManagement {
}
}

// Workaround for https://github.com/gradle/gradle/issues/26020
buildscript {
repositories {
mavenCentral()
gradlePluginPortal()
}
dependencies {
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$embeddedKotlinVersion")
}
}

includeSubproject("base")
includeSubproject("android")
includeSubproject("config")
Expand Down
13 changes: 12 additions & 1 deletion gradle/plugin/settings/settings-plugins.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,16 @@ plugins {
group = "ru.pixnews.gradle.settings"

dependencies {
implementation("com.gradle:gradle-enterprise-gradle-plugin:3.16.1")
implementation("com.gradle:gradle-enterprise-gradle-plugin:3.16.2")
}

// Workaround for https://github.com/gradle/gradle/issues/26020
buildscript {
repositories {
mavenCentral()
gradlePluginPortal()
}
dependencies {
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$embeddedKotlinVersion")
}
}
8 changes: 0 additions & 8 deletions pixnews.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,6 @@
* Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
*/
plugins {
alias(libs.plugins.android.application) apply false
alias(libs.plugins.android.library) apply false
alias(libs.plugins.anvil) apply false
alias(libs.plugins.firebase.crashlytics) apply false
alias(libs.plugins.kotlin.jvm) apply false
alias(libs.plugins.ksp) apply false
alias(libs.plugins.wire) apply false
alias(libs.plugins.ben.manes.versions)
id("ru.pixnews.gradle.lint.detekt")
id("ru.pixnews.gradle.lint.diktat")
id("ru.pixnews.gradle.lint.spotless")
Expand Down
21 changes: 21 additions & 0 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,27 @@ plugins {
id("ru.pixnews.gradle.settings.root")
}

// Workaround for https://github.com/gradle/gradle/issues/26020
buildscript {
repositories {
mavenCentral()
google()
}
dependencies {
classpath("com.android.tools.build:gradle:8.4.0-alpha13")
classpath("com.squareup.anvil:gradle-plugin:2.5.0-beta04")
classpath("com.google.firebase:firebase-crashlytics-gradle:2.9.9")
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.23")
classpath("com.google.devtools.ksp:symbol-processing-gradle-plugin:1.9.23-1.0.19")
classpath("com.squareup.wire:wire-gradle-plugin:4.9.7")
classpath("com.github.ben-manes:gradle-versions-plugin:0.51.0")
classpath("androidx.room:androidx.room.gradle.plugin:2.6.1")
classpath("com.diffplug.spotless:spotless-plugin-gradle:6.25.0")
classpath("com.saveourtool.diktat:diktat-gradle-plugin:2.0.0")
classpath("io.gitlab.arturbosch.detekt:detekt-formatting:1.23.5")
}
}

rootProject.name = "Pixnews"
rootProject.buildFileName = "pixnews.gradle.kts"

Expand Down

0 comments on commit 89f684b

Please sign in to comment.