diff --git a/.github/workflows/development-ci.yml b/.github/workflows/development-ci.yml index dae9d7b..7c99b55 100644 --- a/.github/workflows/development-ci.yml +++ b/.github/workflows/development-ci.yml @@ -12,10 +12,10 @@ jobs: steps: - name: Git checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Java JDK 11 setup - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: 11 architecture: x64 diff --git a/.github/workflows/release-ci.yml b/.github/workflows/release-ci.yml index 48d8fd3..29cc524 100644 --- a/.github/workflows/release-ci.yml +++ b/.github/workflows/release-ci.yml @@ -12,10 +12,10 @@ jobs: steps: - name: Git checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Java JDK 11 setup - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: 11 architecture: x64 diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml index ae3f30a..fe63bb6 100644 --- a/.idea/kotlinc.xml +++ b/.idea/kotlinc.xml @@ -1,6 +1,6 @@ - \ No newline at end of file diff --git a/README.MD b/README.MD index 75fbe45..a650194 100644 --- a/README.MD +++ b/README.MD @@ -36,18 +36,18 @@ Enjoying my work? A show of support would be much obliged :grin: | Library Version | Dremio Version | Status | |-----------------|----------------|------------| -| 0.2.x | 20.1.0 | Legacy | -| 0.3.x | 21.1.1 | Legacy | -| 0.4.x | 21.2.0 | Legacy | -| 0.5.x | 22.0.0 | Legacy | -| 0.6.x | 22.1.1 | Legacy | -| 0.7.x | 23.0.1 | Legacy | -| 0.8.x | 23.1.0 | Legacy | -| 0.9.x | 24.0.0 | Maintained | -| 0.10.x | 24.1.0 | Maintained | -| 0.11.x | 24.2.6 | Maintained | -| 0.12.x | 24.3.0 | Maintained | - +| 0.2.x | 20.1.x | Legacy | +| 0.3.x | 21.1.x | Legacy | +| 0.4.x | 21.2.x | Legacy | +| 0.5.x | 22.0.x | Legacy | +| 0.6.x | 22.1.x | Legacy | +| 0.7.x | 23.0.x | Legacy | +| 0.8.x | 23.1.x | Legacy | +| 0.9.x | 24.0.x | Legacy | +| 0.10.x | 24.1.x | Legacy | +| 0.11.x | 24.2.x | Legacy | +| 0.12.x | 24.3.x | Maintained | +| 0.13.x | 25.0.x | Maintained | ### Usage Notes diff --git a/detekt.yml b/detekt.yml index 30577dd..ec22cc5 100644 --- a/detekt.yml +++ b/detekt.yml @@ -1,28 +1,11 @@ build: maxIssues: 0 - weights: - # complexity: 2 - # LongParameterList: 1 - # style: 1 - # comments: 1 processors: active: true - exclude: - # - 'FunctionCountProcessor' - # - 'PropertyCountProcessor' - # - 'ClassCountProcessor' - # - 'PackageCountProcessor' - # - 'KtFileCountProcessor' console-reports: active: true - exclude: - # - 'ProjectStatisticsReport' - # - 'ComplexityReport' - # - 'NotificationReport' - # - 'FindingsReport' - # - 'BuildFailureReport' comments: active: true @@ -304,13 +287,11 @@ naming: excludes: "**/test/**,**/androidTest/**,**/*.Test.kt,**/*.Spec.kt,**/*.Spek.kt" functionPattern: '^([a-z$][a-zA-Z$0-9]*)|(`.*`)$' excludeClassPattern: '$^' - ignoreOverridden: true FunctionParameterNaming: active: true excludes: "**/test/**,**/androidTest/**,**/*.Test.kt,**/*.Spec.kt,**/*.Spek.kt" parameterPattern: '[a-z][A-Za-z0-9]*' excludeClassPattern: '$^' - ignoreOverridden: true InvalidPackageDeclaration: active: false rootPackage: '' @@ -349,7 +330,6 @@ naming: variablePattern: '[a-z][A-Za-z0-9]*' privateVariablePattern: '(_)?[a-z][A-Za-z0-9]*' excludeClassPattern: '$^' - ignoreOverridden: true performance: active: true @@ -421,7 +401,7 @@ style: includeLineWrapping: false ForbiddenComment: active: true - values: [ 'FIXME:','STOPSHIP:' ] + comments: [ 'FIXME:','STOPSHIP:' ] ForbiddenImport: active: false imports: [ ] @@ -432,7 +412,7 @@ style: active: false ignoreOverridableFunction: true excludedFunctions: - - 'describeContents' + - 'describeContents' LoopWithTooManyJumpStatements: active: false maxJumpCount: 1 @@ -448,8 +428,6 @@ style: ignoreNamedArgument: true ignoreEnums: false ignoreRanges: false - MandatoryBracesIfStatements: - active: false MaxLineLength: active: true excludes: "**/*Configuration.kt" @@ -471,8 +449,6 @@ style: active: true OptionalUnit: active: false - OptionalWhenBraces: - active: false PreferToOverPairSyntax: active: false ProtectedMemberInFinalClass: @@ -483,7 +459,7 @@ style: active: true max: 2 excludedFunctions: - - "equals" + - "equals" excludeLabeled: false excludeReturnFromLambda: true SafeCast: diff --git a/pom.xml b/pom.xml index bea8f77..7c9199b 100644 --- a/pom.xml +++ b/pom.xml @@ -5,24 +5,25 @@ org.sheinbergon dremio-udf-gis + 9.3 - 24.3.0-202312190021150029-52db2faf - 12.0.3-20231120223228-a225426e14-dremio + 25.0.0-202404051521110861-ed9515a8 + 14.0.2-20240131150813-452ae43b2e-dremio 1.3.0 1.19.0 1.19.0 2.11.0 4.13.2 - 5.10.1 - 1.10.1 - 1.9.21 - 5.7.2 + 5.10.2 + 1.10.2 + 1.9.23 + 5.9.0 2.9 - 1.23.4 + 1.23.5 0.7.0 - 12.0.1 + 14.0.2 - 0.13.0-SNAPSHOT + 0.14.0-SNAPSHOT dremio-udf-gis GIS UDF extensions for Dremio https://github.com/sheinbergon/dremio-udf-gis @@ -240,7 +241,7 @@ detekt-maven-plugin ${detekt.version} - 1.8 + 11 detekt.yml @@ -325,8 +326,8 @@ maven-compiler-plugin 3.10.1 - 1.8 - 1.8 + 11 + 11 @@ -394,18 +395,13 @@ - 1.8 + 11 - - org.apache.maven.plugins - maven-surefire-plugin - 3.1.2 - org.jacoco jacoco-maven-plugin - 0.8.8 + 0.8.10 prepare-agent @@ -438,70 +434,15 @@ - - org.jetbrains.kotlin - kotlin-maven-plugin - ${kotlin.version} - - - test-compile - process-test-sources - - test-compile - - - - compile - process-sources - - compile - - - - - 1.8 - - org.apache.maven.plugins maven-surefire-plugin - 3.0.0-M7 - - - org.jacoco - jacoco-maven-plugin - 0.8.8 - - - prepare-agent - - prepare-agent - - - - report - test - - report - - - - - - org.eluder.coveralls - coveralls-maven-plugin - 4.3.0 + 3.1.2 - UTF-8 - ${env.COVERALLS_TOKEN} + + true + - - - javax.xml.bind - jaxb-api - 2.3.1 - - @@ -529,7 +470,7 @@ org.apache.maven.plugins maven-gpg-plugin - 3.0.1 + 3.2.4 sign-artifacts diff --git a/src/main/java/org/sheinbergon/dremio/udf/gis/STAsText.java b/src/main/java/org/sheinbergon/dremio/udf/gis/STAsText.java index 46d1cf0..8d496fd 100644 --- a/src/main/java/org/sheinbergon/dremio/udf/gis/STAsText.java +++ b/src/main/java/org/sheinbergon/dremio/udf/gis/STAsText.java @@ -22,8 +22,6 @@ import com.dremio.exec.expr.annotations.Output; import com.dremio.exec.expr.annotations.Param; - - import javax.inject.Inject; @FunctionTemplate( diff --git a/src/main/java/org/sheinbergon/dremio/udf/gis/util/GeometryHelpers.java b/src/main/java/org/sheinbergon/dremio/udf/gis/util/GeometryHelpers.java index e128ba6..6aff1c0 100644 --- a/src/main/java/org/sheinbergon/dremio/udf/gis/util/GeometryHelpers.java +++ b/src/main/java/org/sheinbergon/dremio/udf/gis/util/GeometryHelpers.java @@ -67,13 +67,6 @@ public static Geometry emptyGeometry() { return factory.createEmpty(GEOMETRY_DIMENSIONS); } - public static String toUTF8String(final @Nonnull VarCharHolder holder) { - return StringFunctionHelpers.toStringFromUTF8( - holder.start, - holder.end, - holder.buffer); - } - public static String toUTF8String(final @Nonnull NullableVarCharHolder holder) { return StringFunctionHelpers.toStringFromUTF8( holder.start, @@ -233,10 +226,6 @@ public static Geometry toGeometry( } } - public static int toBitValue(final boolean value) { - return value ? BIT_TRUE : BIT_FALSE; - } - public static void populate( final @Nonnull byte[] bytes, final @Nonnull ArrowBuf buffer,