Update our Ktor version; add new means of updating (#5085)

bjhham · web-flow · commit a221cbcb8bbc · 2025-09-18T07:52:03.000+02:00
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,2 @@
+# Prevent merges from clobbering version
+VERSION merge=ours
diff --git a/VERSION b/VERSION
@@ -0,0 +1 @@
+3.4.0-SNAPSHOT
diff --git a/build-logic/src/main/kotlin/ktorbuild/internal/Version.kt b/build-logic/src/main/kotlin/ktorbuild/internal/Version.kt
@@ -14,7 +14,7 @@ import org.gradle.api.Project
  * ```
  */
 internal fun Project.resolveVersion(): String {
-    val projectVersion = project.version.toString()
+    val projectVersion = project.rootDir.resolve("VERSION").readText().trim()
     val releaseVersion = providers.gradleProperty("releaseVersion").orNull
     val eapVersion = providers.gradleProperty("eapVersion").orNull
 
diff --git a/gradle.properties b/gradle.properties
@@ -7,7 +7,6 @@ kotlin.code.style=official
 
 # config
 group=io.ktor
-version=3.3.0
 
 ## Performance
 

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+# Prevent merges from clobbering version`
	`2`	`+VERSION merge=ours`