Skip to content

Commit f71b1ca

Browse files
wba2hiwba2hi
authored
fix: Configuration Cache Support (eclipse-velocitas#12)
* chore: Enable Configuration Cache in Github Actions * fix: Configuration Cache Support * chore: Remove redundant/transitive Dependencies * chore: Use DirectoryProperty for Input and Output Folder * feature: Update kuksa-java-sdk to 0.3.2 * chore: Remove Workaround for Depedency Clash
1 parent 551fb8d commit f71b1ca

File tree

15 files changed

+240
-344
lines changed

15 files changed

+240
-344
lines changed

‎.github/workflows/build-main.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
uses: gradle/actions/setup-gradle@v4
2222

2323
- name: Run 'assemble' with Gradle Wrapper
24-
run: ./gradlew assemble
24+
run: ./gradlew assemble --configuration-cache
2525

2626
- name: Run 'check' with Gradle Wrapper
2727
run: ./gradlew check

‎.github/workflows/build-pull-request.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
uses: gradle/actions/setup-gradle@v4
2121

2222
- name: Run 'assemble' with Gradle Wrapper
23-
run: ./gradlew assemble
23+
run: ./gradlew assemble --configuration-cache
2424

2525
- name: Run 'check' with Gradle Wrapper
2626
run: ./gradlew check

‎gradle/libs.versions.toml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,12 @@ kotest = "5.9.1"
99
mockk = "1.13.7"
1010
gson = "2.10.1"
1111
kotlinpoet = "1.16.0"
12-
kuksa-java-sdk = "0.3.1"
12+
kuksa-java-sdk = "0.3.2"
1313

1414
[libraries]
1515
junit-jupiter-api = { module = "org.junit.jupiter:junit-jupiter-api", version.ref = "junitJupiter" }
1616
junit-jupiter-engine = { module = "org.junit.jupiter:junit-jupiter-engine", version.ref = "junitJupiter" }
1717
detekt-formatting = { module = "io.gitlab.arturbosch.detekt:detekt-formatting", version.ref = "detektFormatting" }
18-
kotlinx-coroutines-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version.ref = "coroutines" }
1918
kotest = { group = "io.kotest", name = "kotest-runner-junit5", version.ref = "kotest" }
2019
mockk = { group = "io.mockk", name = "mockk", version.ref = "mockk" }
2120
gson = { module = "com.google.code.gson:gson", version.ref = "gson" }
@@ -30,6 +29,6 @@ android-application = { id = "com.android.application", version.ref = "agp" }
3029
detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt" }
3130
kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
3231
kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
33-
dokka = { id = "org.jetbrains.dokka", version = "1.9.10" }
32+
dokka = { id = "org.jetbrains.dokka", version = "1.9.20" }
3433
pluginPublishing = { id = "com.gradle.plugin-publish", version = "1.2.1" }
3534
gradle-nexus-publish-plugin = { id = "io.github.gradle-nexus.publish-plugin", version = "2.0.0" }

‎samples/android-app/build.gradle.kts‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@ android {
1616
minSdk = 24
1717
targetSdk = 34
1818
}
19-
packaging {
20-
resources.pickFirsts.add("**")
21-
}
2219

2320
compileOptions {
2421
sourceCompatibility = JavaVersion.VERSION_11
@@ -32,6 +29,5 @@ android {
3229
dependencies {
3330
implementation(project(":sdk"))
3431

35-
implementation("org.eclipse.kuksa:vss-core:0.3.1")
3632
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.1")
3733
}

‎samples/android-app/gradle.lockfile‎

Lines changed: 37 additions & 76 deletions
Large diffs are not rendered by default.

‎samples/android-lib/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,6 @@ android {
2828

2929
dependencies {
3030
implementation(project(":sdk"))
31-
implementation("org.eclipse.kuksa:vss-core:0.3.1")
31+
3232
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.1")
3333
}

‎samples/android-lib/gradle.lockfile‎

Lines changed: 17 additions & 57 deletions
Large diffs are not rendered by default.

‎samples/java-app/build.gradle.kts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@ kotlin {
2020
dependencies {
2121
implementation(project(":sdk"))
2222

23-
implementation("org.eclipse.kuksa:vss-core:0.3.1")
24-
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1")
23+
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.8.1")
2524
}
2625

2726
vssProcessor {

‎samples/java-app/gradle.lockfile‎

Lines changed: 42 additions & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -1,88 +1,49 @@
11
# This is a Gradle generated file for dependency locking.
22
# Manual edits can break the build and are not advised.
33
# This file is expected to be part of source control.
4-
com.github.ajalt:colormath:1.2.0=runtimeClasspath
5-
com.github.ajalt:mordant:1.2.1=runtimeClasspath
6-
com.google.android:annotations:4.1.1.4=runtimeClasspath
7-
com.google.code.findbugs:jsr305:3.0.2=compileClasspath,runtimeClasspath
8-
com.google.code.gson:gson:2.10.1=runtimeClasspath
9-
com.google.errorprone:error_prone_annotations:2.23.0=compileClasspath,runtimeClasspath
10-
com.google.guava:failureaccess:1.0.1=runtimeClasspath
11-
com.google.guava:guava:32.1.3-android=runtimeClasspath
12-
com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=runtimeClasspath
13-
com.google.protobuf:protobuf-javalite:3.25.3=compileClasspath,runtimeClasspath
14-
com.google.protobuf:protobuf-kotlin-lite:3.25.3=compileClasspath,runtimeClasspath
15-
com.squareup.okio:okio-jvm:3.4.0=runtimeClasspath
16-
com.squareup.okio:okio:3.4.0=runtimeClasspath
17-
io.github.classgraph:classgraph:4.8.172=runtimeClasspath
18-
io.github.java-diff-utils:java-diff-utils:4.12=runtimeClasspath
19-
io.grpc:grpc-api:1.65.1=compileClasspath,runtimeClasspath
20-
io.grpc:grpc-context:1.65.1=runtimeClasspath
21-
io.grpc:grpc-core:1.65.1=runtimeClasspath
22-
io.grpc:grpc-kotlin-stub:1.4.1=runtimeClasspath
23-
io.grpc:grpc-okhttp:1.65.1=runtimeClasspath
24-
io.grpc:grpc-protobuf-lite:1.65.1=compileClasspath,runtimeClasspath
25-
io.grpc:grpc-stub:1.65.1=runtimeClasspath
26-
io.grpc:grpc-util:1.65.1=runtimeClasspath
27-
io.kotest:kotest-assertions-api-jvm:5.9.1=runtimeClasspath
28-
io.kotest:kotest-assertions-api:5.9.1=runtimeClasspath
29-
io.kotest:kotest-assertions-core-jvm:5.9.1=runtimeClasspath
30-
io.kotest:kotest-assertions-core:5.9.1=runtimeClasspath
31-
io.kotest:kotest-assertions-shared-jvm:5.9.1=runtimeClasspath
32-
io.kotest:kotest-assertions-shared:5.9.1=runtimeClasspath
33-
io.kotest:kotest-common-jvm:5.9.1=runtimeClasspath
34-
io.kotest:kotest-common:5.9.1=runtimeClasspath
35-
io.kotest:kotest-extensions-jvm:5.9.1=runtimeClasspath
36-
io.kotest:kotest-extensions:5.9.1=runtimeClasspath
37-
io.kotest:kotest-framework-api-jvm:5.9.1=runtimeClasspath
38-
io.kotest:kotest-framework-api:5.9.1=runtimeClasspath
39-
io.kotest:kotest-framework-concurrency-jvm:5.9.1=runtimeClasspath
40-
io.kotest:kotest-framework-concurrency:5.9.1=runtimeClasspath
41-
io.kotest:kotest-framework-discovery-jvm:5.9.1=runtimeClasspath
42-
io.kotest:kotest-framework-discovery:5.9.1=runtimeClasspath
43-
io.kotest:kotest-framework-engine-jvm:5.9.1=runtimeClasspath
44-
io.kotest:kotest-framework-engine:5.9.1=runtimeClasspath
45-
io.kotest:kotest-runner-junit5-jvm:5.9.1=runtimeClasspath
46-
io.kotest:kotest-runner-junit5:5.9.1=runtimeClasspath
47-
io.perfmark:perfmark-api:0.26.0=runtimeClasspath
48-
javax.annotation:javax.annotation-api:1.3.2=runtimeClasspath
49-
net.bytebuddy:byte-buddy-agent:1.10.9=runtimeClasspath
50-
net.bytebuddy:byte-buddy:1.10.9=runtimeClasspath
51-
net.java.dev.jna:jna-platform:5.9.0=runtimeClasspath
52-
net.java.dev.jna:jna:5.9.0=runtimeClasspath
53-
org.checkerframework:checker-qual:3.37.0=runtimeClasspath
54-
org.codehaus.mojo:animal-sniffer-annotations:1.23=runtimeClasspath
55-
org.eclipse.kuksa:kuksa-java-sdk:0.3.1=compileClasspath,runtimeClasspath
56-
org.eclipse.kuksa:vss-core:0.3.1=compileClasspath,runtimeClasspath
4+
com.google.android:annotations:4.1.1.4=runtimeClasspath,testRuntimeClasspath
5+
com.google.code.findbugs:jsr305:3.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
6+
com.google.code.gson:gson:2.10.1=runtimeClasspath,testRuntimeClasspath
7+
com.google.errorprone:error_prone_annotations:2.23.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
8+
com.google.guava:failureaccess:1.0.1=runtimeClasspath,testRuntimeClasspath
9+
com.google.guava:guava:32.1.3-android=runtimeClasspath,testRuntimeClasspath
10+
com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=runtimeClasspath,testRuntimeClasspath
11+
com.google.protobuf:protobuf-javalite:3.25.1=compileClasspath,testCompileClasspath
12+
com.google.protobuf:protobuf-javalite:3.25.3=runtimeClasspath,testRuntimeClasspath
13+
com.google.protobuf:protobuf-kotlin-lite:3.25.3=runtimeClasspath,testRuntimeClasspath
14+
com.squareup.okio:okio-jvm:3.4.0=runtimeClasspath,testRuntimeClasspath
15+
com.squareup.okio:okio:3.4.0=runtimeClasspath,testRuntimeClasspath
16+
io.grpc:grpc-api:1.65.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
17+
io.grpc:grpc-context:1.65.1=runtimeClasspath,testRuntimeClasspath
18+
io.grpc:grpc-core:1.65.1=runtimeClasspath,testRuntimeClasspath
19+
io.grpc:grpc-kotlin-stub:1.4.1=runtimeClasspath,testRuntimeClasspath
20+
io.grpc:grpc-okhttp:1.65.1=runtimeClasspath,testRuntimeClasspath
21+
io.grpc:grpc-protobuf-lite:1.65.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
22+
io.grpc:grpc-stub:1.65.1=runtimeClasspath,testRuntimeClasspath
23+
io.grpc:grpc-util:1.65.1=runtimeClasspath,testRuntimeClasspath
24+
io.perfmark:perfmark-api:0.26.0=runtimeClasspath,testRuntimeClasspath
25+
javax.annotation:javax.annotation-api:1.3.2=runtimeClasspath,testRuntimeClasspath
26+
org.checkerframework:checker-qual:3.37.0=runtimeClasspath,testRuntimeClasspath
27+
org.codehaus.mojo:animal-sniffer-annotations:1.23=runtimeClasspath,testRuntimeClasspath
28+
org.eclipse.kuksa:kuksa-java-sdk:0.3.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
29+
org.eclipse.kuksa:vss-core:0.3.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
5730
org.jetbrains.intellij.deps:trove4j:1.0.20200330=kotlinCompilerClasspath
5831
org.jetbrains.kotlin:kotlin-compiler-embeddable:1.9.22=kotlinCompilerClasspath
5932
org.jetbrains.kotlin:kotlin-daemon-embeddable:1.9.22=kotlinCompilerClasspath
6033
org.jetbrains.kotlin:kotlin-reflect:1.6.10=kotlinCompilerClasspath
61-
org.jetbrains.kotlin:kotlin-reflect:1.9.23=runtimeClasspath
62-
org.jetbrains.kotlin:kotlin-script-runtime:1.9.22=kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain
63-
org.jetbrains.kotlin:kotlin-scripting-common:1.9.22=kotlinCompilerPluginClasspathMain
64-
org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.9.22=kotlinCompilerPluginClasspathMain
65-
org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.9.22=kotlinCompilerPluginClasspathMain
66-
org.jetbrains.kotlin:kotlin-scripting-jvm:1.9.22=kotlinCompilerPluginClasspathMain
67-
org.jetbrains.kotlin:kotlin-stdlib-common:1.9.23=runtimeClasspath
68-
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.0=runtimeClasspath
69-
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.0=runtimeClasspath
70-
org.jetbrains.kotlin:kotlin-stdlib:1.9.22=compileClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain
71-
org.jetbrains.kotlin:kotlin-stdlib:1.9.23=runtimeClasspath
72-
org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.8.1=compileClasspath,runtimeClasspath
73-
org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.8.1=compileClasspath,runtimeClasspath
74-
org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1=compileClasspath,runtimeClasspath
75-
org.jetbrains.kotlinx:kotlinx-coroutines-debug:1.8.1=runtimeClasspath
76-
org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:1.8.1=runtimeClasspath
77-
org.jetbrains.kotlinx:kotlinx-coroutines-test-jvm:1.8.1=runtimeClasspath
78-
org.jetbrains.kotlinx:kotlinx-coroutines-test:1.8.1=runtimeClasspath
79-
org.jetbrains:annotations:13.0=kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain
80-
org.jetbrains:annotations:23.0.0=compileClasspath,runtimeClasspath
81-
org.junit.jupiter:junit-jupiter-api:5.8.2=runtimeClasspath
82-
org.junit.platform:junit-platform-commons:1.8.2=runtimeClasspath
83-
org.junit.platform:junit-platform-engine:1.8.2=runtimeClasspath
84-
org.junit.platform:junit-platform-launcher:1.8.2=runtimeClasspath
85-
org.junit.platform:junit-platform-suite-api:1.8.2=runtimeClasspath
86-
org.junit:junit-bom:5.8.2=runtimeClasspath
87-
org.opentest4j:opentest4j:1.3.0=runtimeClasspath
88-
empty=kotlinScriptDefExtensions,testKotlinScriptDefExtensions
34+
org.jetbrains.kotlin:kotlin-reflect:1.9.22=runtimeClasspath,testRuntimeClasspath
35+
org.jetbrains.kotlin:kotlin-script-runtime:1.9.22=kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
36+
org.jetbrains.kotlin:kotlin-scripting-common:1.9.22=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
37+
org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.9.22=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
38+
org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.9.22=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
39+
org.jetbrains.kotlin:kotlin-scripting-jvm:1.9.22=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
40+
org.jetbrains.kotlin:kotlin-stdlib-common:1.9.22=runtimeClasspath,testRuntimeClasspath
41+
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.0=runtimeClasspath,testRuntimeClasspath
42+
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.0=runtimeClasspath,testRuntimeClasspath
43+
org.jetbrains.kotlin:kotlin-stdlib:1.9.22=compileClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
44+
org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.8.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
45+
org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.8.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
46+
org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1=runtimeClasspath,testRuntimeClasspath
47+
org.jetbrains:annotations:13.0=kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
48+
org.jetbrains:annotations:23.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
49+
empty=annotationProcessor,kotlinScriptDefExtensions,testAnnotationProcessor,testKotlinScriptDefExtensions

‎samples/java-lib/build.gradle.kts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@ kotlin {
2020
dependencies {
2121
implementation(project(":sdk"))
2222

23-
implementation("org.eclipse.kuksa:vss-core:0.3.1")
24-
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1")
23+
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.8.1")
2524
}
2625

2726
vssProcessor {

0 commit comments

Comments
 (0)