Skip to content

Commit

Permalink
Merge pull request #38 from 1c-syntax/feature/bumpGradle84
Browse files Browse the repository at this point in the history
bump gradle version
  • Loading branch information
theshadowco committed Oct 5, 2023
2 parents 9656c62 + f3f2d35 commit aeb5a3b
Show file tree
Hide file tree
Showing 10 changed files with 659 additions and 134 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
strategy:
fail-fast: false
matrix:
java_version: ['11', '17']
java_version: ['11', '17', '21']
os: [ubuntu-latest, windows-latest, macOS-latest]
steps:
- uses: actions/checkout@v3
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/qa.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@ jobs:
submodules: true
- run: |
git fetch --prune --unshallow
- name: Set up JDK 11
- name: Set up JDK 17
uses: actions/setup-java@v3
with:
java-version: 11
java-version: 17
distribution: 'adopt'
- name: SonarCloud Scan
run: ./gradlew check sonarqube
run: ./gradlew check sonar
env:
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
57 changes: 46 additions & 11 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,14 +1,49 @@
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and WebStorm
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839

# User-specific stuff
.idea/**/workspace.xml
.idea/**/tasks.xml
.idea/**/usage.statistics.xml
.idea/**/dictionaries
.idea/**/shelf

# Generated files
.idea/**/contentModel.xml

# Sensitive or high-churn files
.idea/**/dataSources/
.idea/**/dataSources.ids
.idea/**/dataSources.local.xml
.idea/**/sqlDataSources.xml
.idea/**/dynamic.xml
.idea/**/uiDesigner.xml
.idea/**/dbnavigator.xml

# Gradle
.idea/**/gradle.xml
.idea/**/libraries

# Gradle and Maven with auto-import
# When using Gradle or Maven with auto-import, you should exclude module files,
# since they will be recreated, and may cause churn. Uncomment if using
# auto-import.
.idea/artifacts
.idea/compiler.xml
.idea/jarRepositories.xml
.idea/modules.xml
.idea/*.iml
.idea/modules
*.iml
*.ipr

# temp files
*.bak
*.orig
build/

# other
.idea/sonarlint/
.gradle/
/.idea/misc.xml

/.idea/sonarlint/
*.orig
/.idea/jarRepositories.xml
/.idea/compiler.xml
/.idea/sonarlint-state.xml
/.idea/sonarlint.xml
/.idea/workspace.xml

/.idea/gradle.xml
/.idea/misc.xml
/.idea/vcs.xml
416 changes: 416 additions & 0 deletions .idea/inspectionProfiles/Project_Default.xml

Large diffs are not rendered by default.

6 changes: 6 additions & 0 deletions .idea/vcs.xml

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

6 changes: 3 additions & 3 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ plugins {
jacoco
id("org.cadixdev.licenser") version "0.6.1"
id("com.github.gradle-git-version-calculator") version "1.1.0"
id("io.freefair.lombok") version "6.6.1"
id("io.freefair.javadoc-links") version "6.6.1"
id("io.freefair.javadoc-utf-8") version "6.6.1"
id("io.freefair.lombok") version "8.0.1"
id("io.freefair.javadoc-links") version "8.0.1"
id("io.freefair.javadoc-utf-8") version "8.0.1"
id("org.sonarqube") version "4.0.0.2929"
}

Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
4 changes: 3 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading

0 comments on commit aeb5a3b

Please sign in to comment.