-
Notifications
You must be signed in to change notification settings - Fork 0
Feature/version catalogs #25
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.
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
Merged
Merged
Changes from 3 commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
e959521
Refactor to use version catalogs
RudolfHladik 1d7661e
Fix previews
RudolfHladik dbe1e8a
Fix blank line
RudolfHladik 3e33449
Add detekt.yml config
RudolfHladik ebca730
Fix LintCheck task
RudolfHladik c625019
Refactor dependency resolution management
matejsemancik 8c96fab
Remove debuggable flag from enterprise build type
matejsemancik 08dac65
Optimize dependencies
matejsemancik 9b92276
Merge pull request #26 from futuredapp/feature/versionCatalogs2
RudolfHladik File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,7 +3,7 @@ | |
| /local.properties | ||
| /.idea/* | ||
| .DS_Store | ||
| /build | ||
| build | ||
| /captures | ||
| .externalNativeBuild | ||
| .cxx | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,71 +1,21 @@ | ||
| import app.futured.androidprojecttemplate.Clean | ||
| import app.futured.androidprojecttemplate.DependencyUpdates | ||
| import app.futured.androidprojecttemplate.LintCheck | ||
| import org.jlleitschuh.gradle.ktlint.reporter.ReporterType | ||
|
|
||
| // Top-level build file where you can add configuration options common to all sub-projects/modules. | ||
|
|
||
| buildscript { | ||
| repositories { | ||
| google() | ||
| } | ||
| dependencies { | ||
| classpath(Dependencies.gradlePlugin) | ||
| classpath(kotlin(Dependencies.Kotlin.gradlePlugin, Versions.kotlin)) | ||
| classpath(Dependencies.hiltPlugin) | ||
| classpath(Dependencies.googleServices) | ||
| classpath(Dependencies.firebaseAppDistribution) | ||
| } | ||
| } | ||
|
|
||
| plugins { | ||
| idea | ||
| id(Dependencies.Plugins.detekt) version Versions.detekt | ||
| id(Dependencies.Plugins.ktlint) version Versions.ktlintGradle | ||
| } | ||
| import io.gitlab.arturbosch.detekt.report.ReportMergeTask | ||
|
|
||
| tasks { | ||
| register<Clean>("clean") | ||
| register<LintCheck>("lintCheck") | ||
| register<DependencyUpdates>("dependencyUpdates") | ||
| register<ReportMergeTask>("detektReportMerge") { | ||
| output.set(rootProject.layout.buildDirectory.file("reports/detekt/merged.xml")) | ||
| } | ||
| } | ||
|
|
||
| allprojects { | ||
| repositories { | ||
| google() | ||
| maven { setUrl("https://jitpack.io") } | ||
| mavenCentral() | ||
| gradlePluginPortal() | ||
| } | ||
| } | ||
|
|
||
| subprojects { | ||
| apply(plugin = Dependencies.Plugins.ktlint) | ||
| ktlint.apply { | ||
| version.set(Versions.ktlint) | ||
| ignoreFailures.set(true) | ||
| android.set(true) | ||
| outputToConsole.set(true) | ||
| reporters { | ||
| reporter(ReporterType.PLAIN) | ||
| reporter(ReporterType.CHECKSTYLE) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| detekt.apply { | ||
| version = Versions.detekt | ||
| source.from(rootDir, "buildSrc/") | ||
| config.from(files("$rootDir/detekt.yml")) | ||
| allRules = false | ||
| } | ||
|
|
||
| ktlint.apply { | ||
| version.set(Versions.ktlint) | ||
| ignoreFailures.set(true) | ||
| android.set(true) | ||
| outputToConsole.set(true) | ||
| reporters { | ||
| reporter(ReporterType.PLAIN) | ||
| reporter(ReporterType.CHECKSTYLE) | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| dependencyResolutionManagement { | ||
| versionCatalogs { | ||
| create("libs") { | ||
| from(files("../gradle/libs.versions.toml")) | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
if I see correctly, there are no convention plugins or any other buildSrc code that depends on these plugins, so they can be removed from buildSrc dependencies and integrated here using
aliaskeyword