Skip to content

Commit 9375277

Browse files
committed
fix: sqlite always not work and another things
this is a huge pr.. before I think this project won't maintain anymore so I work myself, and follow another fork.. but that one also inactive I will pr for this This pr induced typos ci, dependabot, bump a lot of dependencies, make format, remove deperate function and etc
1 parent 18e65bc commit 9375277

File tree

76 files changed

+1339
-924
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+1339
-924
lines changed

.github/dependabot.yml

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
# To get started with Dependabot version updates, you'll need to specify which
2+
# package ecosystems to update and where the package manifests are located.
3+
# Please see the documentation for all configuration options:
4+
# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
5+
6+
# docs
7+
# https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
8+
version: 2
9+
updates:
10+
- package-ecosystem: "gradle"
11+
directory: "/"
12+
schedule:
13+
interval: "weekly"
14+
# We release on Tuesdays and open dependabot PRs will rebase after the
15+
# version bump and thus consume unnecessary workers during release, thus
16+
# let's open new ones on Wednesday
17+
day: "wednesday"
18+
ignore:
19+
- dependency-name: "*"
20+
update-types: ["version-update:semver-patch"]
21+
groups:
22+
# Only update polars as a whole as there are many subcrates that need to
23+
# be updated at once. We explicitly depend on some of them, so batch their
24+
# updates to not take up dependabot PR slots with dysfunctional PRs
25+
polars:
26+
patterns:
27+
- "polars"
28+
- "polars-*"
29+
- package-ecosystem: "github-actions"
30+
directory: "/"
31+
schedule:
32+
interval: "weekly"
33+
day: "wednesday"

.github/workflows/build.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Build
33
on:
44
push:
55
branches:
6-
- main
6+
- master
77
pull_request:
88
workflow_dispatch:
99

@@ -17,12 +17,14 @@ jobs:
1717
steps:
1818
- uses: actions/checkout@v4
1919
- name: Setup JDK
20-
uses: actions/setup-java@v3
20+
uses: actions/setup-java@v4
2121
with:
2222
distribution: 'temurin'
2323
java-version: ${{ matrix.java }}
2424
- name: Setup Gradle
25-
uses: gradle/gradle-build-action@v2
25+
uses: gradle/actions/setup-gradle@v3
26+
with:
27+
cache-disabled: ${{ contains(matrix.os, 'windows') }}
2628
- name: Build
2729
run: ./gradlew :server:build :shared:build -PjavaVersion=${{ matrix.java }}
2830
- name: Detekt

.github/workflows/typos.yml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
---
2+
# yamllint disable rule:line-length
3+
name: check_typos
4+
5+
on: # yamllint disable-line rule:truthy
6+
push:
7+
pull_request:
8+
branches:
9+
- '**'
10+
11+
jobs:
12+
build:
13+
runs-on: ubuntu-latest
14+
15+
steps:
16+
- uses: actions/checkout@v4
17+
18+
- name: typos-action
19+
uses: crate-ci/typos@v1.29.4

.gitignore

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@ build
1616
target
1717
out
1818

19-
# Kotlin
20-
.kotlin
21-
2219
# Python
2320
__pycache__
2421

@@ -32,3 +29,4 @@ node_modules
3229
!.vscode/tasks.json
3330
*.vsix
3431
kls_database.db
32+
.kotlin

_typos.toml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
[files]
2+
extend-exclude = ["server/src/test/resources/completions/*.kt"]
3+
4+
[default.extend-words]
5+
ba = "ba"
6+
vertx = "vertx"

build.gradle.kts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ detekt {
2424
// Registers a baseline for Detekt.
2525
//
2626
// The way it works is that you set create "baseline" for Detekt
27-
// by running this task. It will then creatae a detekt-baseline.xml which
27+
// by running this task. It will then create a detekt-baseline.xml which
2828
// contains a list of current issues found within the project.
2929
// Then every time you run the "detekt" task it will only report errors
3030
// that are not in the baseline config.
@@ -33,6 +33,7 @@ detekt {
3333
// fix detekt issues so that we can prevent regressions.
3434
tasks.register<DetektCreateBaselineTask>("createDetektBaseline") {
3535
description = "Overrides current baseline."
36+
group = "verification"
3637
buildUponDefaultConfig.set(true)
3738
ignoreFailures.set(true)
3839
parallel.set(true)

detekt.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@ comments:
1010

1111
complexity:
1212
excludes: *standardExcludes
13+
CyclomaticComplexMethod:
14+
threshold: 25
15+
NestedBlockDepth:
16+
threshold: 10
1317

1418
empty-blocks:
1519
excludes: *standardExcludes
@@ -24,6 +28,8 @@ exceptions:
2428
- NumberFormatException
2529
- ParseException
2630
- MissingPropertyException
31+
TooGenericExceptionCaught:
32+
active: false
2733

2834
naming:
2935
excludes: *standardExcludes
@@ -38,6 +44,9 @@ style:
3844
excludes: *standardExcludes
3945
MaxLineLength:
4046
active: false
47+
ReturnCount:
48+
active: true
49+
max: 3 # Maximum allowed return statements in a function
4150
WildcardImport:
4251
excludeImports:
4352
- java.util.*

detekt_baseline.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<SmellBaseline>
33
<ManuallySuppressedIssues></ManuallySuppressedIssues>
44
<CurrentIssues>
5-
<ID>ComplexCondition:SemanticTokens.kt$element is KtVariableDeclaration &amp;&amp; (!element.isVar || element.hasModifier(KtTokens.CONST_KEYWORD)) || element is KtParameter</ID>
5+
<ID>ComplexCondition:SemanticTokens.kt$element is KtVariableDeclaration &amp;&amp; (!element.isVar() || element.hasModifier(KtTokens.CONST_KEYWORD)) || element is KtParameter</ID>
66
<ID>CyclomaticComplexMethod:Completions.kt$private fun elementCompletions(file: CompiledFile, cursor: Int, surroundingElement: KtElement): Sequence&lt;DeclarationDescriptor&gt;</ID>
77
<ID>CyclomaticComplexMethod:Completions.kt$private fun indexCompletionItems(file: CompiledFile, cursor: Int, element: KtElement?, index: SymbolIndex, partial: String): Sequence&lt;CompletionItem&gt;</ID>
88
<ID>CyclomaticComplexMethod:GoToDefinition.kt$fun goToDefinition( file: CompiledFile, cursor: Int, classContentProvider: ClassContentProvider, tempDir: TemporaryDirectory, config: ExternalSourcesConfiguration, cp: CompilerClassPath ): Location?</ID>
@@ -26,7 +26,7 @@
2626
<ID>EmptyClassBlock:samefile.kt$MyImplClass${}</ID>
2727
<ID>EmptyClassBlock:samefile.kt$NullClass${}</ID>
2828
<ID>EmptyClassBlock:samefile.kt$PrintableClass${}</ID>
29-
<ID>EmptyClassBlock:standardlib.kt$MyComperable${}</ID>
29+
<ID>EmptyClassBlock:standardlib.kt$MyComparable${}</ID>
3030
<ID>EmptyClassBlock:standardlib.kt$MyList${}</ID>
3131
<ID>EmptyClassBlock:standardlib.kt$MyThread${}</ID>
3232
<ID>EmptyDefaultConstructor:BigFile.kt$BigFile.A$()</ID>

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
version=1.3.14
1+
version=1.3.13
22
javaVersion=11

gradle/libs.versions.toml

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
11
[versions]
22
kotlinVersion = "2.1.0"
3-
lsp4jVersion = "0.21.2"
4-
exposedVersion = "0.37.3"
3+
lsp4jVersion = "0.23.1"
4+
exposedVersion = "0.58.0"
55
jmhVersion = "1.20"
6-
guavaVersion = "33.3.0-jre"
6+
slf4j = "2.0.16"
7+
gruava = "33.4.0-jre"
78

89
[libraries]
10+
com-google-guava.guava = { module = "com.google.guava:guava", version.ref = "gruava" }
11+
912
org-jetbrains-kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlinVersion" }
1013
org-jetbrains-kotlin-compiler = { module = "org.jetbrains.kotlin:kotlin-compiler", version.ref = "kotlinVersion" }
1114
org-jetbrains-kotlin-ktscompiler = { module = "org.jetbrains.kotlin:kotlin-scripting-compiler", version.ref = "kotlinVersion" }
@@ -32,21 +35,23 @@ org-jetbrains-fernflower = { module = "org.jetbrains:fernflower", version = "1.0
3235

3336
com-github-fwcd-ktfmt = { module = "com.github.fwcd.ktfmt:ktfmt", version = "b5d31d1" }
3437

35-
com-google-guava-guava = { module = "com.google.guava:guava", version.ref = "guavaVersion" }
36-
3738
com-h2database-h2 = { module = "com.h2database:h2", version = "1.4.200" }
3839

3940
com-beust-jcommander = { module = "com.beust:jcommander", version = "1.78" }
4041

4142
org-openjdk-jmh-generator-annprocess = { module = "org.openjdk.jmh:jmh-generator-annprocess", version.ref = "jmhVersion" }
4243
org-openjdk-jmh-core = { module = "org.openjdk.jmh:jmh-core", version.ref = "jmhVersion" }
4344

44-
org-xerial-sqlite-jdbc = { module = "org.xerial:sqlite-jdbc", version = "3.41.2.1" }
45+
org-xerial-sqlite-jdbc = { module = "org.xerial:sqlite-jdbc", version = "3.48.0.0" }
4546

4647
# buildSrc
47-
org-jetbrains-kotlin-gradle-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin",version.ref = "kotlinVersion" }
48+
org-jetbrains-kotlin-gradle-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlinVersion" }
49+
50+
org-slf4j-api = { module = "org.slf4j:slf4j-api", version.ref = "slf4j" }
51+
org-slf4j-simple = { module = "org.slf4j:slf4j-simple", version.ref = "slf4j" }
52+
4853

4954
[plugins]
50-
com-github-jk1-tcdeps = { id = "com.github.jk1.tcdeps", version = "1.2" }
51-
com-jaredsburrows-license = { id = "com.jaredsburrows.license", version = "0.8.42" }
55+
com-github-jk1-tcdeps = { id = "com.github.jk1.tcdeps", version = "1.6.2" }
56+
com-jaredsburrows-license = { id = "com.jaredsburrows.license", version = "0.9.8" }
5257
io-gitlab-arturbosch-detekt = { id = "io.gitlab.arturbosch.detekt", version = "1.22.0" }

0 commit comments

Comments
 (0)