empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Use more plugin aliases.

Browse source
This commit is contained in:
Greyson Parrelli 2024-12-20 10:41:04 -05:00
parent efdc7e266a
commit 859eabe3d3
8 changed files with 35 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/build.gradle.kts
View file

@ -7,11 +7,10 @@ import java.util.Date
import java.util.Properties
plugins {
id("com.android.application")
id("kotlin-android")
alias(libs.plugins.android.application)
alias(libs.plugins.jetbrains.kotlin.android)
alias(libs.plugins.ktlint)
id("androidx.navigation.safeargs")
id("org.jlleitschuh.gradle.ktlint")
id("org.jetbrains.kotlin.android")
id("app.cash.exhaustive")
id("kotlin-parcelize")
id("com.squareup.wire")

10
build-logic/build.gradle.kts
View file

@ -1,16 +1,12 @@
import org.gradle.kotlin.dsl.extra
plugins {
alias(libs.plugins.jetbrains.kotlin.jvm) apply false
}
buildscript {
val kotlinVersion by extra("1.9.20")
repositories {
google()
mavenCentral()
}
dependencies {
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
}
}
apply(from = "${rootDir}/../constants.gradle.kts")

4
build-logic/plugins/build.gradle.kts
View file

@ -2,8 +2,8 @@ import org.gradle.kotlin.dsl.extra
plugins {
`kotlin-dsl`
alias(libs.plugins.ktlint)
id("groovy-gradle-plugin")
id("org.jlleitschuh.gradle.ktlint") version "12.1.1"
}
val signalJavaVersion: JavaVersion by rootProject.extra
@ -24,8 +24,8 @@ dependencies {
implementation(libs.kotlin.gradle.plugin)
implementation(libs.android.library)
implementation(libs.android.application)
implementation(project(":tools"))
implementation(libs.ktlint)
implementation(project(":tools"))
// These allow us to reference the dependency catalog inside of our compiled plugins
implementation(files(libs.javaClass.superclass.protectionDomain.codeSource.location))

2
build-logic/plugins/src/main/java/signal-library.gradle.kts
View file

@ -16,6 +16,8 @@ val signalJavaVersion: JavaVersion by rootProject.extra
val signalKotlinJvmTarget: String by rootProject.extra
plugins {
// We cannot use the version catalog in the plugins block in convention plugins (it's not supported).
// Instead, plugin versions are controlled through the dependencies block in the build.gradle.kts.
id("com.android.library")
id("kotlin-android")
id("ktlint")

2
build-logic/plugins/src/main/java/signal-sample-app.gradle.kts
View file

@ -18,6 +18,8 @@ val signalJavaVersion: JavaVersion by rootProject.extra
val signalKotlinJvmTarget: String by rootProject.extra
plugins {
// We cannot use the version catalog in the plugins block in convention plugins (it's not supported).
// Instead, plugin versions are controlled through the dependencies block in the build.gradle.kts.
id("com.android.application")
id("kotlin-android")
id("ktlint")

4
build-logic/tools/build.gradle.kts
View file

@ -1,7 +1,7 @@
plugins {
id("org.jetbrains.kotlin.jvm")
alias(libs.plugins.jetbrains.kotlin.jvm)
id("java-library")
id("org.jlleitschuh.gradle.ktlint") version "12.1.1"
alias(libs.plugins.ktlint)
}
val signalJavaVersion: JavaVersion by rootProject.extra

10
build.gradle.kts
View file

@ -1,5 +1,11 @@
plugins {
alias(libs.plugins.android.application) apply false
alias(libs.plugins.jetbrains.kotlin.android) apply false
alias(libs.plugins.jetbrains.kotlin.jvm) apply false
alias(libs.plugins.ktlint)
}
buildscript {
rootProject.extra["kotlin_version"] = "1.9.20"
repositories {
google()
mavenCentral()
@ -15,8 +21,6 @@ buildscript {
classpath(libs.gradle)
classpath(libs.androidx.navigation.safe.args.gradle.plugin)
classpath(libs.protobuf.gradle.plugin)
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${rootProject.extra["kotlin_version"] as String}")
classpath(libs.ktlint)
classpath(libs.exhaustive.gradle)
classpath("com.squareup.wire:wire-gradle-plugin:4.4.3") {
exclude(group = "com.squareup.wire", module = "wire-swift-generator")

11
gradle/libs.versions.toml
View file

@ -21,6 +21,15 @@ accompanist = "0.28.0"
nanohttpd = "2.3.1"
navigation-safe-args-gradle-plugin = "2.5.3"
protobuf-gradle-plugin = "0.9.0"
ktlint = "12.1.1"
[plugins]
android-application = { id = "com.android.application", version.ref = "android-gradle-plugin" }
android-library = { id = "com.android.library", version.ref = "android-gradle-plugin" }
jetbrains-kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
jetbrains-kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
ktlint = { id = "org.jlleitschuh.gradle.ktlint", version.ref = "ktlint" }
androidx-navigation-safe-args = { id = "androidx.navigation.safeargs", version.ref = "navigation-safe-args-gradle-plugin" }
[libraries]
# Android Plugins
@ -53,7 +62,7 @@ kotlinx-coroutines-core = "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.9.0"
kotlinx-coroutines-core-jvm = "org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.9.0"
kotlinx-coroutines-play-services = "org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.8.1"
kotlinx-coroutines-rx3 = "org.jetbrains.kotlinx:kotlinx-coroutines-rx3:1.3.9"
ktlint = "org.jlleitschuh.gradle:ktlint-gradle:12.1.1"
ktlint = { module = "org.jlleitschuh.gradle:ktlint-gradle", version.ref = "ktlint" }
ktlint-twitter-compose = "com.twitter.compose.rules:ktlint:0.0.26"
# Android X