Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: ktorio/ktor-samples
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 18543bdf7aa3df072427a1d166c029bb8a718113
Choose a base ref
..
head repository: ktorio/ktor-samples
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 7feb7c70a4fb2acc052032e3cd9f6c51220eeba0
Choose a head ref
Showing with 10 additions and 3 deletions.
  1. +1 −1 structured-logging/build.gradle.kts
  2. +8 −1 version-diff/README.md
  3. +1 −1 version-diff/src/main/kotlin/Main.kt
2 changes: 1 addition & 1 deletion structured-logging/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@ repositories {
dependencies {
implementation("io.ktor:ktor-server-html-builder")
implementation("io.ktor:ktor-server-netty-jvm")
implementation("org.jetbrains.kotlin-wrappers:kotlin-css:1.0.0-pre.851")
implementation("org.jetbrains.kotlin-wrappers:kotlin-css:1.0.0-pre.852")
implementation("ch.qos.logback:logback-classic:$logback_version")
implementation("net.logstash.logback:logstash-logback-encoder:7.1.1")
testImplementation("io.ktor:ktor-server-test-host-jvm")
9 changes: 8 additions & 1 deletion version-diff/README.md
Original file line number Diff line number Diff line change
@@ -7,5 +7,12 @@ A diff tool for maven artifacts written using the [Ktor](https://ktor.io) client
Execute this command in a sample directory:

```bash
./gradlew run --args="1.6.8 2.2.2 <Optional repo url, default https://repo.maven.apache.org/maven2/io/ktor>"
./gradlew run --args="1.6.8 2.2.2"
```

* `1.6.8` and `2.2.2` are the versions of the Maven artifact to compare.
* By default, the repository URL is https://repo.maven.apache.org/maven2/io/ktor.
If you want to use a repository other than the default, provide it explicitly as the third argument:
```bash
./gradlew run --args="2.3.13 3.0.0 https://oss.sonatype.org/content/repositories/releases/io/ktor"
```
2 changes: 1 addition & 1 deletion version-diff/src/main/kotlin/Main.kt
Original file line number Diff line number Diff line change
@@ -18,7 +18,7 @@ fun main(args: Array<String>) = runBlocking {
val firstVersion = args[0]
val secondVersion = args[1]

val repo = if (args.size > 2) args[3] else DEFAULT_REPO
val repo = if (args.size > 2) args[2] else DEFAULT_REPO

println("Fetching diff for $repo $firstVersion -> $secondVersion")