diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 29cee17f24..5794e77d31 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -53,7 +53,7 @@ jobs: run: ./gradlew licensee --no-configuration-cache - name: 'Analyse' run: ./gradlew detekt ktlintCheck lint -x lintRelease ${{ env.SCAN }} - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 if: always() with: name: 'Analyses' @@ -61,7 +61,7 @@ jobs: **/build/reports/detekt - name: 'Unit tests' run: ./gradlew :selekt-android:testDebugUnitTest :selekt-java:test :koverHtmlReport -x integrationTest ${{ env.SCAN }} - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 if: always() with: name: 'Unit test and coverage reports' @@ -77,7 +77,7 @@ jobs: ./gradlew :koverVerify -x integrationTest - name: 'Build others' run: | - ./gradlew assembleAndroidTest :AndroidCLI:assembleDebug :selekt-android-lint:assemble jmhClasses + ./gradlew assembleAndroidTest :AndroidCLI:assembleDebug :selekt-android-lint:assemble dokkaHtml - name: 'Tear down' if: always() run: | diff --git a/.gitignore b/.gitignore index b0bf696c9c..8c773453b2 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,7 @@ .vscode build .gradle +.kotlin *.iml local.properties .externalNativeBuild diff --git a/AndroidCLI/build.gradle.kts b/AndroidCLI/build.gradle.kts index 965a843171..6396fb3d2f 100644 --- a/AndroidCLI/build.gradle.kts +++ b/AndroidCLI/build.gradle.kts @@ -28,7 +28,7 @@ repositories { android { compileSdk = Versions.ANDROID_SDK.version.toInt() - buildToolsVersion = libs.android.tools.gradle.get().version!! + buildToolsVersion = "34.0.0" namespace = "com.bloomberg.selekt.cli" defaultConfig { applicationId = "com.bloomberg.selekt.cli" diff --git a/AndroidLibBenchmark/build.gradle.kts b/AndroidLibBenchmark/build.gradle.kts index 3855c12ca3..5af52c811f 100644 --- a/AndroidLibBenchmark/build.gradle.kts +++ b/AndroidLibBenchmark/build.gradle.kts @@ -29,7 +29,7 @@ repositories { android { compileSdkVersion(Versions.ANDROID_SDK.version.toInt()) - buildToolsVersion(libs.android.tools.gradle.get().version!!) + buildToolsVersion("34.0.0") namespace = "com.bloomberg.selekt.android.benchmark" defaultConfig { minSdkVersion(21) @@ -49,6 +49,7 @@ android { dependencies { androidTestImplementation(projects.selektAndroid) + androidTestImplementation(projects.selektJava) androidTestImplementation(libs.androidx.benchmark.junit4) androidTestImplementation(libs.androidx.test.ext) androidTestImplementation(libs.androidx.test.rules) diff --git a/CHANGELOG.md b/CHANGELOG.md index f64069277c..51139d3656 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,28 @@ Change Log ========== +## Version 0.23.0 + +### Fixes + +* Replace use of `ScheduledExecutorService.scheduleAtFixedRate` with `ScheduledExecutorService.scheduleWithFixedDelay` when evicting from the connection pools. `ScheduledExecutorService.scheduleAtFixedRate` is an API discouraged by Android Lint. +* Support compiling 16 KB-aligned shared libraries with Android NDK version r27 and higher. + +## Version 0.22.3 + +### Dependencies + +* Kotlin 2.0.20. + +## Version 0.22.2 + +### Dependencies + +* Android Gradle Plugin 8.5.2. +* Gradle 8.10. +* Kotlin 1.9.24. +* NDK 27. + ## Version 0.22.1 ### Dependencies diff --git a/build.gradle.kts b/build.gradle.kts index 9964025240..36e3862b9e 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -40,6 +40,7 @@ plugins { alias(libs.plugins.ktlint) alias(libs.plugins.ideaExt) alias(libs.plugins.qodana) + alias(libs.plugins.ksp) apply false } repositories { diff --git a/buildSrc/src/main/kotlin/JmhPlugin.kt b/buildSrc/src/main/kotlin/JmhPlugin.kt index dd66ae8dbd..11e126d28e 100644 --- a/buildSrc/src/main/kotlin/JmhPlugin.kt +++ b/buildSrc/src/main/kotlin/JmhPlugin.kt @@ -32,7 +32,7 @@ class JmhPlugin : Plugin { add(name, project) add(name, "org.openjdk.jmh:jmh-core:${Versions.JMH}") } - configurations.getByName("kaptJmh") { + configurations.getByName("kspJmh") { add(name, "org.openjdk.jmh:jmh-generator-annprocess:${Versions.JMH}") } } diff --git a/docs/getting_started.md b/docs/getting_started.md index c1e6eee04c..22f2d201d2 100644 --- a/docs/getting_started.md +++ b/docs/getting_started.md @@ -22,7 +22,7 @@ } dependencies { - implementation platform('com.bloomberg:selekt-bom:')) + implementation platform('com.bloomberg:selekt-bom:') implementation 'com.bloomberg:selekt-android' runtimeOnly 'com.bloomberg:selekt-android-sqlcipher' } diff --git a/gradle.properties b/gradle.properties index dd68e5dfad..01f82153eb 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ -selekt.versionName=0.22.1 -selekt.nextVersionName=0.23.0 +selekt.versionName=0.23.0 +selekt.nextVersionName=0.24.0 openssl.version=3.1.2 openssl.sha256=a0ce69b8b97ea6a35b96875235aa453b966ba3cba8af2de23657d8b6767d6539 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 43f5166711..38b7772b2d 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,13 +1,13 @@ # https://docs.gradle.org/current/userguide/platforms.html#sub:conventional-dependencies-toml [versions] -benchmark = "1.2.4" +benchmark = "1.3.0" jmh = "1.37" lint = "31.5.2" room = "2.6.1" [libraries] -android-tools-gradle = { group = "com.android.tools.build", name = "gradle", version = "8.5.2" } +android-tools-gradle = { group = "com.android.tools.build", name = "gradle", version = "8.6.0" } android-tools-lint = { group = "com.android.tools.lint", name = "lint", version.ref = "lint" } android-tools-lint-api = { group = "com.android.tools.lint", name = "lint-api", version.ref = "lint" } androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version = "1.7.0" } @@ -27,7 +27,7 @@ jmh-core = { group = "org.openjdk.jmh", name = "jmh-core", version.ref = "jmh" } jmh-generator-annprocess = { group = "org.openjdk.jmh", name = "jmh-generator-annprocess", version.ref = "jmh" } junit-junit = { group = "junit", name = "junit", version = "4.13.2" } junit-jupiter-params = { group = "org.junit.jupiter", name = "junit-jupiter-params", version = "5.10.2" } -kotlin-bom = { group = "org.jetbrains.kotlin", name = "kotlin-bom", version = "1.9.24" } +kotlin-bom = { group = "org.jetbrains.kotlin", name = "kotlin-bom", version = "2.0.20" } kotlin-reflect = { group = "org.jetbrains.kotlin", name = "kotlin-reflect" } kotlin-test = { group = "org.jetbrains.kotlin", name = "kotlin-test" } kotlin-test-junit = { group = "org.jetbrains.kotlin", name = "kotlin-test-junit" } @@ -46,6 +46,7 @@ detekt = { id = "io.gitlab.arturbosch.detekt", version = "1.22.0" } dokka = { id = "org.jetbrains.dokka", version = "1.9.20" } ideaExt = { id = "org.jetbrains.gradle.plugin.idea-ext", version = "1.1.7" } kover = { id = "org.jetbrains.kotlinx.kover", version = "0.7.6" } +ksp = { id = "com.google.devtools.ksp", version = "2.0.20-1.0.24" } ktlint = { id = "org.jlleitschuh.gradle.ktlint", version = "11.5.0" } nexus = { id = "io.github.gradle-nexus.publish-plugin", version = "1.3.0" } qodana = { id = "org.jetbrains.qodana", version = "0.1.12" } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index f6b961fd5a..a4b76b9530 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 5dcd8c1705..b74d32f10d 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,8 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=682b4df7fe5accdca84a4d1ef6a3a6ab096b3efd5edf7de2bd8c758d95a93703 -distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-all.zip +distributionSha256Sum=fdfca5dbc2834f0ece5020465737538e5ba679deeff5ab6c09621d67f8bb1a15 +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.1-all.zip networkTimeout=120000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index cccdd3d517..f5feea6d6b 100755 --- a/gradlew +++ b/gradlew @@ -1,78 +1,130 @@ -#!/usr/bin/env sh +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# SPDX-License-Identifier: Apache-2.0 +# ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## # Attempt to set APP_HOME + # Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null - -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="" +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s +' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + # Determine the Java command to use to start the JVM. if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -81,92 +133,120 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the location of your Java installation." + fi fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac fi -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) -# For Cygwin, switch paths to Windows format before running java -if $cygwin ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=$((i+1)) + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg done - case $i in - (0) set -- ;; - (1) set -- "$args0" ;; - (2) set -- "$args0" "$args1" ;; - (3) set -- "$args0" "$args1" "$args2" ;; - (4) set -- "$args0" "$args1" "$args2" "$args3" ;; - (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=$(save "$@") - -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" -# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong -if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then - cd "$(dirname "$0")" +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" fi +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat index e95643d6a2..9b42019c79 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,4 +1,22 @@ -@if "%DEBUG%" == "" @echo off +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem + +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -9,25 +27,29 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS= +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" @rem Find java.exe if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init +if %ERRORLEVEL% equ 0 goto execute -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -35,48 +57,36 @@ goto fail set JAVA_HOME=%JAVA_HOME:"=% set JAVA_EXE=%JAVA_HOME%/bin/java.exe -if exist "%JAVA_EXE%" goto init +if exist "%JAVA_EXE%" goto execute -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail -:init -@rem Get command-line arguments, handling Windows variants - -if not "%OS%" == "Windows_NT" goto win9xME_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* - :execute @rem Setup the command line set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/selekt-android-sqlcipher/build.gradle.kts b/selekt-android-sqlcipher/build.gradle.kts index 8f61a3c6ae..5f9c4340e0 100644 --- a/selekt-android-sqlcipher/build.gradle.kts +++ b/selekt-android-sqlcipher/build.gradle.kts @@ -38,11 +38,17 @@ val allABIs = listOf("armeabi-v7a", "arm64-v8a", "x86", "x86_64") android { compileSdk = Versions.ANDROID_SDK.version.toInt() - buildToolsVersion = libs.android.tools.gradle.get().version!! + buildToolsVersion = "34.0.0" namespace = "com.bloomberg.selekt.android.sqlcipher" - ndkVersion = "26.3.11579264" + ndkVersion = "27.0.12077973" defaultConfig { minSdk = 21 + @Suppress("UnstableApiUsage") + externalNativeBuild { + cmake { + arguments("-DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=ON") + } + } } buildTypes { debug { diff --git a/selekt-android/build.gradle.kts b/selekt-android/build.gradle.kts index a1abea789d..da6e20e668 100644 --- a/selekt-android/build.gradle.kts +++ b/selekt-android/build.gradle.kts @@ -22,7 +22,7 @@ plugins { id("kotlin-android") alias(libs.plugins.dokka) alias(libs.plugins.cash.licensee) - kotlin("kapt") + alias(libs.plugins.ksp) `maven-publish` signing alias(libs.plugins.kover) @@ -37,7 +37,7 @@ repositories { android { compileSdk = Versions.ANDROID_SDK.version.toInt() - buildToolsVersion = libs.android.tools.gradle.get().version!! + buildToolsVersion = "34.0.0" namespace = "com.bloomberg.selekt.android" defaultConfig { minSdk = 21 @@ -64,7 +64,7 @@ dependencies { compileOnly(libs.androidx.room.runtime) implementation(projects.selektJava) implementation(projects.selektSqlite3Classes) - kaptTest(libs.androidx.room.compiler) + kspTest(libs.androidx.room.compiler) testImplementation(libs.androidx.lifecycle.livedata.ktx) testImplementation(libs.androidx.room.runtime) testImplementation(libs.androidx.room.ktx) diff --git a/selekt-java/build.gradle.kts b/selekt-java/build.gradle.kts index d24286cef6..137a6c8ec0 100644 --- a/selekt-java/build.gradle.kts +++ b/selekt-java/build.gradle.kts @@ -16,9 +16,6 @@ @file:Suppress("UnstableApiUsage") -import org.jetbrains.dokka.gradle.DokkaTask -import org.jetbrains.dokka.gradle.DokkaTaskPartial - repositories { mavenCentral() google() @@ -26,13 +23,12 @@ repositories { plugins { kotlin("jvm") - kotlin("kapt") + alias(libs.plugins.ksp) id("com.android.lint") alias(libs.plugins.kover) alias(libs.plugins.dokka) `maven-publish` signing - id("bb-jmh") alias(libs.plugins.detekt) alias(libs.plugins.ktlint) } @@ -62,7 +58,6 @@ val integrationTestRuntimeOnly: Configuration by configurations.getting { dependencies { implementation(projects.selektApi) implementation(projects.selektSqlite3Classes) - jmhImplementation(libs.kotlinx.coroutines.core) } publishing { @@ -99,11 +94,3 @@ tasks.register("copyJniLibs") { tasks.withType().configureEach { dependsOn("buildHostSQLite") } - -tasks.withType().configureEach { - dependsOn("kaptKotlin") // FIXME Remove? -} - -tasks.withType().configureEach { - dependsOn("kaptKotlin") // FIXME Remove? -} diff --git a/selekt-java/src/main/kotlin/com/bloomberg/selekt/pools/CommonObjectPool.kt b/selekt-java/src/main/kotlin/com/bloomberg/selekt/pools/CommonObjectPool.kt index f70b2eafc3..2403c14107 100644 --- a/selekt-java/src/main/kotlin/com/bloomberg/selekt/pools/CommonObjectPool.kt +++ b/selekt-java/src/main/kotlin/com/bloomberg/selekt/pools/CommonObjectPool.kt @@ -181,7 +181,7 @@ class CommonObjectPool>( if (future?.isCancelled == false || configuration.evictionIntervalMillis < 0L || isClosed.get()) { return } - future = executor.scheduleAtFixedRate( + future = executor.scheduleWithFixedDelay( ::evict, configuration.evictionDelayMillis, configuration.evictionIntervalMillis, diff --git a/selekt-java/src/main/kotlin/com/bloomberg/selekt/pools/SingleObjectPool.kt b/selekt-java/src/main/kotlin/com/bloomberg/selekt/pools/SingleObjectPool.kt index eed41aaeaa..efbcc0a9a0 100644 --- a/selekt-java/src/main/kotlin/com/bloomberg/selekt/pools/SingleObjectPool.kt +++ b/selekt-java/src/main/kotlin/com/bloomberg/selekt/pools/SingleObjectPool.kt @@ -118,7 +118,7 @@ class SingleObjectPool>( if (evictionIntervalMillis < 0L || isClosed) { return } - future = executor.scheduleAtFixedRate( + future = executor.scheduleWithFixedDelay( ::evict, evictionDelayMillis, evictionIntervalMillis, diff --git a/selekt-java/src/test/kotlin/com/bloomberg/selekt/pools/CommonObjectPoolTest.kt b/selekt-java/src/test/kotlin/com/bloomberg/selekt/pools/CommonObjectPoolTest.kt index 69a6b64ba0..5a9645ac08 100644 --- a/selekt-java/src/test/kotlin/com/bloomberg/selekt/pools/CommonObjectPoolTest.kt +++ b/selekt-java/src/test/kotlin/com/bloomberg/selekt/pools/CommonObjectPoolTest.kt @@ -360,17 +360,16 @@ internal class CommonObjectPoolTest { @Test fun interleavedBorrowSchedulesEvictionIfCancelled() { - @Suppress("JoinDeclarationAndAssignment") lateinit var pool: CommonObjectPool val executor = object : ScheduledExecutorService by this@CommonObjectPoolTest.executor { var count = 0 - override fun scheduleAtFixedRate( + override fun scheduleWithFixedDelay( command: Runnable, initialDelay: Long, - period: Long, + delay: Long, unit: TimeUnit - ) = this@CommonObjectPoolTest.executor.scheduleAtFixedRate(command, initialDelay, period, unit).also { + ) = this@CommonObjectPoolTest.executor.scheduleWithFixedDelay(command, initialDelay, delay, unit).also { if (count++ == 0) { it.cancel(false) } @@ -459,12 +458,12 @@ internal class CommonObjectPoolTest { @Test fun evictionFailsIfCancelled() { val executor = object : ScheduledExecutorService by this@CommonObjectPoolTest.executor { - override fun scheduleAtFixedRate( + override fun scheduleWithFixedDelay( command: Runnable, initialDelay: Long, - period: Long, + delay: Long, unit: TimeUnit - ) = this@CommonObjectPoolTest.executor.scheduleAtFixedRate(command, initialDelay, period, unit).apply { + ) = this@CommonObjectPoolTest.executor.scheduleWithFixedDelay(command, initialDelay, delay, unit).apply { cancel(false) } } diff --git a/selekt-java/src/test/kotlin/com/bloomberg/selekt/pools/SingleObjectPoolTest.kt b/selekt-java/src/test/kotlin/com/bloomberg/selekt/pools/SingleObjectPoolTest.kt index c97f6ce830..6a2d544f34 100644 --- a/selekt-java/src/test/kotlin/com/bloomberg/selekt/pools/SingleObjectPoolTest.kt +++ b/selekt-java/src/test/kotlin/com/bloomberg/selekt/pools/SingleObjectPoolTest.kt @@ -349,12 +349,12 @@ internal class SingleObjectPoolTest { @Test fun evictionFailsIfCancelled() { val executor = object : ScheduledExecutorService by this@SingleObjectPoolTest.executor { - override fun scheduleAtFixedRate( + override fun scheduleWithFixedDelay( command: Runnable, initialDelay: Long, - period: Long, + delay: Long, unit: TimeUnit - ) = this@SingleObjectPoolTest.executor.scheduleAtFixedRate(command, initialDelay, period, unit).apply { + ) = this@SingleObjectPoolTest.executor.scheduleAtFixedRate(command, initialDelay, delay, unit).apply { cancel(false) } } @@ -382,10 +382,8 @@ internal class SingleObjectPoolTest { @Test fun borrowAsClosingDoesNotScheduleEviction() { - @Suppress("JoinDeclarationAndAssignment") - lateinit var pool: SingleObjectPool val executor = mock() - pool = SingleObjectPool(object : IObjectFactory { + val pool = SingleObjectPool(object : IObjectFactory { override fun close() = Unit override fun destroyObject(obj: PooledObject) = Unit