Merge remote-tracking branch 'origin/master'

# Conflicts: # compiler-plugin/build.gradle.kts
Foso · Mar 16, 2024 · 8b1a826 · 8b1a826
2 parents dadb1b7 + aa73c6c
commit 8b1a826
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -8,9 +8,9 @@ jobs:
  runs-on: ubuntu-latest
 
  steps:
- - uses: actions/checkout@v3
+ - uses: actions/checkout@v4
  - name: Set up JDK 1.8
- uses: actions/setup-java@v3
+ uses: actions/setup-java@v4
  with:
  java-version: '11'
  distribution: 'zulu'

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -9,7 +9,7 @@ buildscript {
  }
 
  dependencies {
- classpath("com.vanniktech:gradle-maven-publish-plugin:0.23.1")
+ classpath("com.vanniktech:gradle-maven-publish-plugin:0.25.3")
  classpath("de.jensklingenberg:gradle-plugin:1.0.0")
  }
 }

diff --git a/compiler-plugin/build.gradle.kts b/compiler-plugin/build.gradle.kts
@@ -27,14 +27,14 @@ mavenPublishing {
 
 group = "de.jensklingenberg"
 version = "0.0.1"
-val autoService = "1.0.1"
+val autoService = "1.1.1"
 dependencies {
  compileOnly("com.google.auto.service:auto-service:$autoService")
  kapt("com.google.auto.service:auto-service:$autoService")
  compileOnly("org.jetbrains.kotlin:kotlin-compiler-embeddable:1.9.23")
  testImplementation("dev.zacsweers.kctfork:core:0.2.1")
  testImplementation("junit:junit:4.13.2")
- testImplementation("com.google.truth:truth:1.1.3")
+ testImplementation("com.google.truth:truth:1.1.5")
  testImplementation(kotlin("reflect"))
 
 }

diff --git a/gradle-plugin/build.gradle.kts b/gradle-plugin/build.gradle.kts
@@ -19,7 +19,7 @@ allprojects {
  }
 }
 dependencies {
- implementation("org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.9.10")
+ implementation("org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.9.21")
 }
 
 gradlePlugin {