From f5789ed721c1609899d9197a34d73b223289fc96 Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Thu, 30 Mar 2023 20:55:38 +0800
Subject: Use Java 17 for setup-java in GitHub Actions (#2938)

---
 .../src/main/kotlin/org/jetbrains/conventions/base-java.gradle.kts     | 3 ---
 .../src/main/kotlin/org/jetbrains/conventions/kotlin-jvm.gradle.kts    | 1 -
 2 files changed, 4 deletions(-)

(limited to 'build-logic/src')

diff --git a/build-logic/src/main/kotlin/org/jetbrains/conventions/base-java.gradle.kts b/build-logic/src/main/kotlin/org/jetbrains/conventions/base-java.gradle.kts
index 0dbac364..cff7eb3e 100644
--- a/build-logic/src/main/kotlin/org/jetbrains/conventions/base-java.gradle.kts
+++ b/build-logic/src/main/kotlin/org/jetbrains/conventions/base-java.gradle.kts
@@ -16,9 +16,6 @@ java {
     toolchain {
         languageVersion.set(dokkaBuild.mainJavaVersion)
     }
-}
-
-java {
     withSourcesJar()
 }
 
diff --git a/build-logic/src/main/kotlin/org/jetbrains/conventions/kotlin-jvm.gradle.kts b/build-logic/src/main/kotlin/org/jetbrains/conventions/kotlin-jvm.gradle.kts
index 28a8d76d..a96a004b 100644
--- a/build-logic/src/main/kotlin/org/jetbrains/conventions/kotlin-jvm.gradle.kts
+++ b/build-logic/src/main/kotlin/org/jetbrains/conventions/kotlin-jvm.gradle.kts
@@ -4,7 +4,6 @@ import org.jetbrains.configureDokkaVersion
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
-    id("org.jetbrains.conventions.base")
     id("org.jetbrains.conventions.base-java")
     kotlin("jvm")
 }
-- 
cgit