Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Gradle cleanup #142

Merged
merged 19 commits into from
Feb 23, 2023
Merged

Gradle cleanup #142

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
e4ca9d5
Use accessor
TWiStErRob Feb 22, 2023
2d27655
Improve Detekt configuration, see https://github.com/detekt/detekt/pu…
TWiStErRob Feb 22, 2023
58c8ced
Remove .conventions suffix from convention plugins.
TWiStErRob Feb 22, 2023
4527711
Extract Project.libs
TWiStErRob Feb 22, 2023
2e19a30
Extract Java version to toml
TWiStErRob Feb 22, 2023
006d2be
Extract Detekt to separate plugin
TWiStErRob Feb 22, 2023
c58fda3
Add Gradle wrapper to plugins so it can be opened.
TWiStErRob Feb 22, 2023
c165825
Extract Kotlin to separate plugin and lazy!
TWiStErRob Feb 22, 2023
88c76e2
Extract Dex stuff to separate plugin!
TWiStErRob Feb 22, 2023
1e12204
Rename android-base plugin
TWiStErRob Feb 23, 2023
ef0aa5e
Create an app module convention
TWiStErRob Feb 23, 2023
a1aa0ab
Extract android fun
TWiStErRob Feb 23, 2023
6c71749
Move extensions to package
TWiStErRob Feb 23, 2023
d6a1cf7
Extract more from Android Base
TWiStErRob Feb 23, 2023
5a17ac6
Move exceptional logic to conventions
TWiStErRob Feb 23, 2023
5faeadd
Format and document a bit
TWiStErRob Feb 23, 2023
365d408
Move to packages
TWiStErRob Feb 23, 2023
d37abcb
Move libs to dsl, because it now needs to be imported
TWiStErRob Feb 23, 2023
d374457
Use new Kotlin DSL
TWiStErRob Feb 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 8 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,14 @@
projectFilesBackup

# Gradle
build/
# rootProject
/build/
# App and module collections
/*/build/
# Features, Components and Gradle Plugins
/*/*/build/
# Contracts
/*/*/*/build/

# Android
local.properties
Expand Down
8 changes: 1 addition & 7 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
plugins {
id("net.twisterrob.android-app")
id("build.android-base.conventions")
id("net.twisterrob.colorfilters.app")
}

dependencies {
Expand All @@ -16,7 +15,6 @@ dependencies {
}

dependencies {
androidTestImplementation(projects.component.testBaseUi)
androidTestImplementation(projects.feature.lighting.testFixtures)
androidTestImplementation(projects.feature.porterduff.testFixtures)
androidTestImplementation(projects.feature.matrix.testFixtures)
Expand All @@ -38,8 +36,4 @@ android {
}
}
*/

lint {
checkDependencies = true
}
}
4 changes: 2 additions & 2 deletions component/test-base-ui/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import static VersionCatalogExt.exclude
import static net.twisterrob.colorfilters.build.dsl.VersionCatalogExt.exclude

plugins {
id("net.twisterrob.colorfilters.component.conventions")
id("net.twisterrob.colorfilters.component")
}

android {
Expand Down
2 changes: 1 addition & 1 deletion component/test-base-unit/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id("net.twisterrob.colorfilters.component.conventions")
id("net.twisterrob.colorfilters.component")
}

android {
Expand Down
2 changes: 1 addition & 1 deletion feature/about/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id("net.twisterrob.colorfilters.feature.conventions")
id("net.twisterrob.colorfilters.feature")
}

android {
Expand Down
2 changes: 1 addition & 1 deletion feature/about/test-fixtures/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
plugins {
id("net.twisterrob.colorfilters.test-fixtures.conventions")
id("net.twisterrob.colorfilters.test-fixtures")
}
2 changes: 1 addition & 1 deletion feature/base/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id("net.twisterrob.colorfilters.component.conventions")
id("net.twisterrob.colorfilters.component")
}

dependencies {
Expand Down
4 changes: 2 additions & 2 deletions feature/image/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import static VersionCatalogExt.exclude
import static net.twisterrob.colorfilters.build.dsl.VersionCatalogExt.exclude

plugins {
id("net.twisterrob.colorfilters.component.conventions")
id("net.twisterrob.colorfilters.component")
}

dependencies {
Expand Down
2 changes: 1 addition & 1 deletion feature/keyboard/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id("net.twisterrob.colorfilters.component.conventions")
id("net.twisterrob.colorfilters.component")
}

dependencies {
Expand Down
2 changes: 1 addition & 1 deletion feature/keyboard/contract/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
plugins {
id("net.twisterrob.colorfilters.component.conventions")
id("net.twisterrob.colorfilters.component")
}
2 changes: 1 addition & 1 deletion feature/lighting/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id("net.twisterrob.colorfilters.feature.conventions")
id("net.twisterrob.colorfilters.feature")
}

dependencies {
Expand Down
2 changes: 1 addition & 1 deletion feature/lighting/test-fixtures/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
plugins {
id("net.twisterrob.colorfilters.test-fixtures.conventions")
id("net.twisterrob.colorfilters.test-fixtures")
}
2 changes: 1 addition & 1 deletion feature/matrix/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id("net.twisterrob.colorfilters.feature.conventions")
id("net.twisterrob.colorfilters.feature")
}

dependencies {
Expand Down
2 changes: 1 addition & 1 deletion feature/matrix/test-fixtures/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
plugins {
id("net.twisterrob.colorfilters.test-fixtures.conventions")
id("net.twisterrob.colorfilters.test-fixtures")
}
2 changes: 1 addition & 1 deletion feature/palette/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id("net.twisterrob.colorfilters.feature.conventions")
id("net.twisterrob.colorfilters.feature")
}

dependencies {
Expand Down
2 changes: 1 addition & 1 deletion feature/palette/test-fixtures/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
plugins {
id("net.twisterrob.colorfilters.test-fixtures.conventions")
id("net.twisterrob.colorfilters.test-fixtures")
}
2 changes: 1 addition & 1 deletion feature/porterduff/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id("net.twisterrob.colorfilters.feature.conventions")
id("net.twisterrob.colorfilters.feature")
}

dependencies {
Expand Down
2 changes: 1 addition & 1 deletion feature/porterduff/test-fixtures/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
plugins {
id("net.twisterrob.colorfilters.test-fixtures.conventions")
id("net.twisterrob.colorfilters.test-fixtures")
}
2 changes: 1 addition & 1 deletion feature/resfont/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id("net.twisterrob.colorfilters.feature.conventions")
id("net.twisterrob.colorfilters.feature")
}

dependencies {
Expand Down
2 changes: 1 addition & 1 deletion feature/resfont/test-fixtures/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
plugins {
id("net.twisterrob.colorfilters.test-fixtures.conventions")
id("net.twisterrob.colorfilters.test-fixtures")
}
1 change: 1 addition & 0 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ agp = "7.4.1"
# https://github.com/TWiStErRob/net.twisterrob.gradle/releases
twisterrob = "0.15"

java = "1.8"
# https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md
kotlin = "1.8.10"
# https://github.com/detekt/detekt/releases
Expand Down
4 changes: 2 additions & 2 deletions gradle/plugins/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ gradlePlugin {
}

tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
kotlinOptions {
allWarningsAsErrors = true
compilerOptions {
allWarningsAsErrors.set(true)
}
}

Expand Down
1 change: 1 addition & 0 deletions gradle/plugins/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
org.gradle.warning.mode=all
Binary file added gradle/plugins/gradle/wrapper/gradle-wrapper.jar
View file
Open in desktop
Binary file not shown.
6 changes: 6 additions & 0 deletions gradle/plugins/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-all.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists