Skip to content

Commit 73b9b5d

Browse files
committed
Remove branches related to K2
Because it has already been some time since 2.x was released and there is virtually no need for verification.
1 parent 29dd362 commit 73b9b5d

File tree

2 files changed

+3
-31
lines changed

2 files changed

+3
-31
lines changed

.github/workflows/test-main.yml

Lines changed: 3 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -42,27 +42,10 @@ jobs:
4242
# LTS versions, latest version (if exists)
4343
java-version: [ '8', '11', '17', '21', '23' ]
4444
# Minimum version, latest release version, latest pre-release version (if exists)
45-
kotlin:
46-
- name: '1.9.25'
47-
version: '1.9.25'
48-
k2: false
49-
- name: '1.9.25 K2'
50-
version: '1.9.25'
51-
k2: true
52-
- name: '2.0.21'
53-
version: '2.0.21'
54-
k2: false
55-
- name: '2.0.21 K2'
56-
version: '2.0.21'
57-
k2: true
58-
- name: '2.1.0-RC2'
59-
k2: false
60-
- name: '2.1.0-RC2 K2'
61-
k2: true
45+
kotlin: ['1.9.25', '2.0.21', '2.1.0-RC2']
6246
env:
63-
KOTLIN_VERSION: ${{ matrix.kotlin.version }}
64-
USE_K2: ${{ matrix.kotlin.k2 }}
65-
name: "Kotlin ${{ matrix.kotlin.name }} - Java ${{ matrix.java-version }}"
47+
KOTLIN_VERSION: ${{ matrix.kotlin }}
48+
name: "Kotlin ${{ matrix.kotlin }} - Java ${{ matrix.java-version }}"
6649
runs-on: ubuntu-latest
6750
timeout-minutes: 15
6851
steps:

build.gradle.kts

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -49,17 +49,6 @@ kotlin {
4949
sourceSets["main"].apply {
5050
kotlin.srcDir(generatedSrcPath)
5151
}
52-
53-
val useK2 = System.getenv("KOTLIN_VERSION")?.takeIf { it.isNotEmpty() }
54-
?.let { it.toBoolean() } ?: false
55-
56-
sourceSets.all {
57-
languageSettings {
58-
if (useK2) {
59-
languageVersion = "2.0"
60-
}
61-
}
62-
}
6352
}
6453

6554
java {

0 commit comments

Comments
 (0)