Skip to content

Commit e1407e4

Browse files
authored
Upgrade Kotlin to MacOS 15 (google#8845)
* upgrade kotlin and macos * remove xcode version selection
1 parent c9a301e commit e1407e4

File tree

2 files changed

+2
-9
lines changed

2 files changed

+2
-9
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -390,17 +390,10 @@ jobs:
390390

391391
build-kotlin-macos:
392392
name: Build Kotlin MacOS
393-
runs-on: macos-13
393+
runs-on: macos-15
394394
steps:
395395
- name: Checkout
396396
uses: actions/checkout@v6
397-
# Force Xcode 14.3 since Xcode 15 doesnt support older versions of
398-
# kotlin. For Xcode 15, kotlin should be bumpped to 1.9.10
399-
# https://stackoverflow.com/a/77150623
400-
# For now, run with macos-13 which has this 14.3 installed:
401-
# https://github.com/actions/runner-images/blob/main/images/macos/macos-13-Readme.md#xcode
402-
- name: Set up Xcode version
403-
run: sudo xcode-select -s /Applications/Xcode_14.3.app/Contents/Developer
404397
- name: set up Java
405398
uses: actions/setup-java@v4
406399
with:

kotlin/gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Version 1.9.10 fix
33
# https://youtrack.jetbrains.com/issue/KT-60230/Native-unknown-options-iossimulatorversionmin-sdkversion-with-Xcode-15-beta-3
44
kotlin = "1.9.10"
5-
plugin-kotlin = "1.6.10"
5+
plugin-kotlin = "1.9.10"
66
plugin-gver = "0.42.0"
77
kotlinx-benchmark = "0.4.8"
88
junit = "4.12"

0 commit comments

Comments
 (0)