Merge pull request #56 from 1c-syntax/feature/fix240604

Fixes 24.06.04

.github/workflows/build.yml

@@ -8,7 +8,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java_version: ['11', '17']
+        java_version: ['17', '20']
         os: [ubuntu-latest, windows-latest, macOS-latest]
     steps:
     - uses: actions/checkout@v4

.github/workflows/release.yml

@@ -10,7 +10,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java_version: ['11']
+        java_version: ['17']
         os: [ubuntu-latest]
     steps:
     - uses: actions/checkout@v4

.gitignore

@@ -70,3 +70,4 @@ temp/
 public/
 /.idea/codeStyles/Project.xml
 /.idea/encodings.xml
+/.idea/material_theme_project_new.xml

build.gradle.kts

@@ -1,23 +1,33 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
 import java.util.*
 
 plugins {
   java
   jacoco
   id("maven-publish")
-  kotlin("jvm") version "1.9.24"
+  kotlin("jvm") version "2.0.0"
   id("java-gradle-plugin")
   id("org.cadixdev.licenser") version "0.6.1"
   id("com.gradle.plugin-publish") version "1.2.1"
 }
 
-pluginBundle {
-  website = "https://github.com/1c-syntax/bslls-dev-tools"
-  vcsUrl = "https://github.com/1c-syntax/bslls-dev-tools.git"
-  tags = listOf("bslls", "dev-tools")
+gradlePlugin {
+  website.set("https://github.com/1c-syntax/bslls-dev-tools")
+  vcsUrl.set("https://github.com/1c-syntax/bslls-dev-tools.git")
+  plugins {
+    create("bslls-dev-tools") {
+      id = "io.github.1c-syntax.bslls-dev-tools"
+      implementationClass = "com.github._1c_syntax.bsllsdevtools.BSLDeveloperToolsPlugin"
+      displayName = "BSLLS Development tools gradle plugin"
+      description = "BSLLS Development tools gradle plugin"
+      tags.set(listOf("bslls", "dev-tools", "bsl-language-server", "1c-syntax"))
+    }
+  }
 }
 
 group = "io.github.1c-syntax"
-version = "0.7.3"
+version = "0.8.0"
 
 repositories {
   mavenLocal()
@@ -34,29 +44,16 @@ dependencies {
   testImplementation("org.assertj", "assertj-core", "3.18.1")
 }
 
-tasks {
-  compileKotlin {
-    kotlinOptions.jvmTarget = "11"
-  }
-  compileTestKotlin {
-    kotlinOptions.jvmTarget = "11"
-  }
-}
-
-gradlePlugin {
-  plugins {
-    create("bslls-dev-tools") {
-      id = "io.github.1c-syntax.bslls-dev-tools"
-      implementationClass = "com.github._1c_syntax.bsllsdevtools.BSLDeveloperToolsPlugin"
-      displayName = "BSLLS Development tools gradle plugin"
-      description = "BSLLS Development tools gradle plugin"
-    }
+kotlin {
+  compilerOptions {
+    apiVersion.set(KotlinVersion.KOTLIN_2_0)
+    jvmTarget.set(JvmTarget.JVM_17)
   }
 }
 
 java {
-  sourceCompatibility = JavaVersion.VERSION_11
-  targetCompatibility = JavaVersion.VERSION_11
+  sourceCompatibility = JavaVersion.VERSION_17
+  targetCompatibility = JavaVersion.VERSION_17
 }
 
 tasks.test {

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists