Skip to content

Add --version flag for version verification #123

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

Closed
ivanalvarado wants to merge 9 commits into from
Closed

Add --version flag for version verification #123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
866293e
Add --version support
ivanalvarado Oct 28, 2024
04189fc
Remove unintentional new line
ivanalvarado Oct 28, 2024
6548b73
Switch to using the BuildConfig plugin
ivanalvarado Jan 14, 2025
2e5225c
Remove appinfo.properties
ivanalvarado Jan 14, 2025
9de2ec0
Revert to java 11
ivanalvarado Jan 14, 2025
dcf8ad8
Merge branch 'main' into add-version-support
ivanalvarado Jan 14, 2025
ef45a77
Link issue to kotlinpoet workaround
ivanalvarado Jan 14, 2025
5ed7302
Check if workaround is still needed
ivanalvarado Jan 15, 2025
28be56b
Revert to java 11
ivanalvarado Jan 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
plugins {
id 'com.squareup.app'
alias(libs.plugins.mavenPublish)
alias(libs.plugins.buildconfig)
}

application {
Expand Down Expand Up @@ -71,3 +72,7 @@ def javaComponent = components['java'] as AdhocComponentWithVariants
skip()
}
}

buildConfig {
buildConfigField("String", "VERSION", "\"${project.property("VERSION_NAME")}\"")
}
5 changes: 5 additions & 0 deletions app/src/main/kotlin/com/squareup/sort/SortCommand.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,10 @@ import com.github.ajalt.clikt.parameters.arguments.multiple
import com.github.ajalt.clikt.parameters.options.default
import com.github.ajalt.clikt.parameters.options.flag
import com.github.ajalt.clikt.parameters.options.option
import com.github.ajalt.clikt.parameters.options.versionOption
Copy link
Copy Markdown
Collaborator

@ZacSweers ZacSweers Jan 14, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TIL!

import com.github.ajalt.clikt.parameters.types.enum
import com.github.ajalt.clikt.parameters.types.path
import com.squareup.app.BuildConfig
import com.squareup.log.DelegatingLogger
import com.squareup.parse.AlreadyOrderedException
import com.squareup.parse.BuildScriptParseException
Expand All @@ -23,6 +25,7 @@ import java.nio.file.FileSystem
import java.nio.file.FileSystems
import java.nio.file.Path
import java.nio.file.StandardOpenOption
import java.util.Properties
import kotlin.io.path.createTempFile
import kotlin.io.path.pathString
import kotlin.io.path.writeText
Expand All @@ -46,6 +49,8 @@ class SortCommand(
)
}
}

versionOption(BuildConfig.VERSION)
}

val paths: List<Path> by argument(help = "Path(s) to sort. Required.")
Expand Down
2 changes: 2 additions & 0 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
[versions]
buildconfig = "5.5.1"
dagp = "2.6.1"
# java is referenced from build-logic
java = "11"
Expand Down Expand Up @@ -35,3 +36,4 @@ kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
dagp = { id = "com.autonomousapps.dependency-analysis", version.ref = "dagp" }
dokka = { id = "org.jetbrains.dokka", version = "1.9.20" }
mavenPublish = { id = "com.vanniktech.maven.publish", version.ref = "mavenPublish" }
buildconfig = { id = "com.github.gmazzo.buildconfig", version.ref = "buildconfig" }