Skip to content

Commit

Permalink
Finish 0.8.0
Browse files Browse the repository at this point in the history
  • Loading branch information
theshadowco committed Jun 4, 2024
2 parents 5abe173 + b6a76e7 commit 80a0f10
Show file tree
Hide file tree
Showing 21 changed files with 218 additions and 159 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,20 @@ 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@v3
- uses: actions/checkout@v4
- name: Set up JDK ${{ matrix.java_version }}
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: ${{ matrix.java_version }}
distribution: 'adopt'
- name: Build with Gradle
run: ./gradlew check --stacktrace
- name: Archive test results
if: failure()
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: junit_report_${{ matrix.os }}_${{ matrix.java_version }}
path: build/reports/tests/test
6 changes: 3 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ jobs:
strategy:
fail-fast: false
matrix:
java_version: ['11']
java_version: ['17']
os: [ubuntu-latest]
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up JDK ${{ matrix.java_version }}
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: ${{ matrix.java_version }}
distribution: 'adopt'
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -70,3 +70,4 @@ temp/
public/
/.idea/codeStyles/Project.xml
/.idea/encodings.xml
/.idea/material_theme_project_new.xml
2 changes: 1 addition & 1 deletion .idea/kotlinc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

49 changes: 23 additions & 26 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -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.7.21"
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.1.0"
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()
Expand All @@ -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 {
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
3 changes: 2 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
Loading

0 comments on commit 80a0f10

Please sign in to comment.