Skip to content

Commit 32328e8

Browse files
committed
remove unneeded ci pipeline
1 parent 0aadecf commit 32328e8

File tree

5 files changed

+12
-78
lines changed

5 files changed

+12
-78
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,9 @@ name: CI Test Workflow
55

66
on:
77
push:
8-
branches: [ main, dev ]
8+
branches: [ main, dev, dev/** ]
99
pull_request:
10-
branches: [ main, dev ]
11-
repository_dispatch:
12-
types: [ok-to-test-command]
10+
branches: [ main, dev, dev/** ]
1311

1412
jobs:
1513
test_android_jvm_linux_trusted:
@@ -38,37 +36,4 @@ jobs:
3836
if: always()
3937
with:
4038
name: code-coverage-report
41-
path: build/reports
42-
test_android_jvm_linux_untrusted:
43-
runs-on: ubuntu-latest
44-
if:
45-
github.event_name == 'repository_dispatch' &&
46-
github.event.client_payload.slash_command.sha != '' &&
47-
contains(github.event.client_payload.pull_request.head.sha, github.event.client_payload.slash_command.sha) &&
48-
github.event.pull_request.head.repo.full_name != github.repository
49-
environment: testing
50-
env:
51-
SPOTIFY_CLIENT_ID: ${{ secrets.SPOTIFY_CLIENT_ID }}
52-
SPOTIFY_CLIENT_SECRET: ${{ secrets.SPOTIFY_CLIENT_SECRET }}
53-
steps:
54-
- name: Fork based /ok-to-test checkout
55-
uses: actions/checkout@v2
56-
with:
57-
ref: 'refs/pull/${{ github.event.client_payload.pull_request.number }}/merge'
58-
- name: Install java 11
59-
uses: actions/setup-java@v2
60-
with:
61-
distribution: 'adopt'
62-
java-version: '11'
63-
- name: Install curl
64-
run: sudo apt-get install -y curl libcurl4-openssl-dev
65-
- name: Test android
66-
run: ./gradlew testDebugUnitTest
67-
- name: Test jvm
68-
run: ./gradlew jvmTest
69-
- name: Archive test results
70-
uses: actions/upload-artifact@v2
71-
if: always()
72-
with:
73-
name: code-coverage-report
74-
path: build/reports
39+
path: build/reports

.github/workflows/ok-to-test.yml

Lines changed: 0 additions & 33 deletions
This file was deleted.

build.gradle.kts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ plugins {
1414
kotlin("plugin.serialization")
1515
id("com.diffplug.spotless") version "6.11.0"
1616
id("com.moowork.node") version "1.3.1"
17-
id("org.jetbrains.dokka") version "1.7.20"
17+
id("org.jetbrains.dokka") version "1.8.20"
1818
}
1919

2020
repositories {
@@ -69,7 +69,7 @@ android {
6969
this.unitTests.isReturnDefaultValues = true
7070
}
7171
sourceSets["main"].setRoot("src/androidMain")
72-
sourceSets["test"].setRoot("src/androidTest")
72+
sourceSets["test"].setRoot("src/androidUnitTest")
7373
}
7474

7575
// invoked in kotlin closure, needs to be registered before
@@ -116,7 +116,7 @@ kotlin {
116116
testTask {
117117
useKarma {
118118
useChromeHeadless()
119-
webpackConfig.cssSupport.enabled = true
119+
webpackConfig.cssSupport { isEnabled = true }
120120
}
121121
}
122122
}
@@ -253,7 +253,7 @@ kotlin {
253253
}
254254
}
255255

256-
val androidTest by getting {
256+
val androidUnitTest by getting {
257257
dependsOn(commonJvmLikeTest)
258258
}
259259

gradle.properties

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ android.enableJetifier=true
99
android.disableAutomaticComponentCreation=false
1010

1111
# language dependencies
12-
kotlinVersion=1.7.21
12+
kotlinVersion=1.9.0
1313

1414
# library dependencies
1515
kotlinxDatetimeVersion=0.4.0
16-
kotlinxSerializationVersion=1.4.1
16+
kotlinxSerializationVersion=1.5.1
1717
ktorVersion=2.1.3
1818
korlibsVersion=3.4.0
19-
kotlinxCoroutinesVersion=1.6.4
19+
kotlinxCoroutinesVersion=1.7.2
2020

2121
androidBuildToolsVersion=7.2.0
2222
androidSpotifyAuthVersion=1.2.5

src/androidMain/res/layout/spotify_pkce_auth_layout.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
android:layout_width="80dp"
1717
android:layout_height="80dp"
1818
android:layout_gravity="center"
19+
android:indeterminate="true"
20+
android:indeterminateTint="#5588FF"
1921
wheel:matProg_barColor="#5588FF"
2022
wheel:matProg_progressIndeterminate="true" />
2123

0 commit comments

Comments
 (0)