Merge pull request #17 from swiftlang/update-to-17

ktoso · web-flow · commit 124ff209cbbb · 2025-11-02T11:58:50.000+09:00
Update hashing-example to Java 17 compatibility
diff --git a/hello-swift-java/hashing-app/build.gradle.kts b/hello-swift-java/hashing-app/build.gradle.kts
@@ -28,11 +28,11 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_11
-        targetCompatibility = JavaVersion.VERSION_11
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
     kotlinOptions {
-        jvmTarget = "11"
+        jvmTarget = "17"
     }
     buildFeatures {
         compose = true
diff --git a/hello-swift-java/hashing-lib/build.gradle b/hello-swift-java/hashing-lib/build.gradle
@@ -14,11 +14,11 @@ android {
     defaultConfig {
         minSdkVersion 28
     }
-}
 
-java {
-    sourceCompatibility = JavaVersion.VERSION_11
-    targetCompatibility = JavaVersion.VERSION_11
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
 }
 
 dependencies {

Original file line number	Diff line number	Diff line change
`@@ -28,11 +28,11 @@ android {`
`28`	`28`	`}`
`29`	`29`	`}`
`30`	`30`	`compileOptions {`
`31`		`- sourceCompatibility = JavaVersion.VERSION_11`
`32`		`- targetCompatibility = JavaVersion.VERSION_11`
	`31`	`+ sourceCompatibility = JavaVersion.VERSION_17`
	`32`	`+ targetCompatibility = JavaVersion.VERSION_17`
`33`	`33`	`}`
`34`	`34`	`kotlinOptions {`
`35`		`- jvmTarget = "11"`
	`35`	`+ jvmTarget = "17"`
`36`	`36`	`}`
`37`	`37`	`buildFeatures {`
`38`	`38`	`compose = true`
Original file line number	Diff line number	Diff line change
`@@ -14,11 +14,11 @@ android {`
`14`	`14`	`defaultConfig {`
`15`	`15`	`minSdkVersion 28`
`16`	`16`	`}`
`17`		`-}`
`18`	`17`
`19`		`-java {`
`20`		`- sourceCompatibility = JavaVersion.VERSION_11`
`21`		`- targetCompatibility = JavaVersion.VERSION_11`
	`18`	`+ compileOptions {`
	`19`	`+ sourceCompatibility = JavaVersion.VERSION_17`
	`20`	`+ targetCompatibility = JavaVersion.VERSION_17`
	`21`	`+ }`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`dependencies {`