diff --git a/.circleci/config.yml b/.circleci/config.yml index 8a74cba..a10cb12 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -2,7 +2,7 @@ version: 2 jobs: build: docker: - - image: circleci/openjdk:8-jdk + - image: cimg/openjdk:8.0.402 working_directory: ~/repo @@ -24,13 +24,15 @@ jobs: - v1-dependencies-{{ checksum "build.gradle" }}-{{ checksum ".circleci/config.yml" }} - v1-dependencies- - - run: - name: Update SonarQube - command: gradle sonarqube -Dsonar.projectKey=gladed_watchable -Dsonar.organization=gladed-github -Dsonar.host.url=https://sonarcloud.io -Dsonar.login=$SONAR_LOGIN +# TODO #101: Restore this +# README: [![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=gladed_watchable&metric=alert_status)](https://sonarcloud.io/dashboard?id=gladed_watchable) +# - run: +# name: Update SonarQube +# command: gradle sonarqube -Dsonar.projectKey=gladed_watchable -Dsonar.organization=gladed-github -Dsonar.host.url=https://sonarcloud.io -Dsonar.login=$SONAR_LOGIN - run: name: Build and test - command: gradle detekt check + command: gradle detekt check --info --stacktrace - run: name: Update codecov.io diff --git a/README.md b/README.md index 55689c3..dfc2ce5 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,6 @@ -[![Download](https://api.bintray.com/packages/gladed/watchable/watchable/images/download.svg?version=0.6.22)](https://bintray.com/gladed/watchable/watchable/0.6.22/link) -[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=gladed_watchable&metric=alert_status)](https://sonarcloud.io/dashboard?id=gladed_watchable) [![CircleCI](https://circleci.com/gh/gladed/watchable.svg?style=svg)](https://circleci.com/gh/gladed/watchable) [![CodeCov](https://codecov.io/github/gladed/watchable/coverage.svg?branch=master)](https://codecov.io/github/gladed/watchable) -[![detekt](https://img.shields.io/badge/code%20style-%E2%9D%A4-FF4081.svg)](https://arturbosch.github.io/detekt/) +[![detekt](https://img.shields.io/badge/code%20style-%E2%9D%A4-FF4081.svg)](https://github.com/detekt/detekt) [![Kotlin](https://img.shields.io/badge/Kotlin-1.4.10-blue.svg)](https://kotlinlang.org/) [![API Docs](https://img.shields.io/badge/API_Docs-latest-purple.svg)](https://gladed.github.io/watchable/latest/watchable/) diff --git a/build.gradle b/build.gradle index 7c5bf15..041a7e7 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,7 @@ buildscript { ext { - detekt_version = '1.14.2' // Must match plugin ID below - dokka_version = '1.4.10' + detekt_version = '1.16.0' // Must match plugin ID below + dokka_version = '1.9.20' jvm_version = '1.8' kotlin_coroutines_version = '1.4.0' kotlin_version = '1.4.10' @@ -11,7 +11,6 @@ buildscript { repositories { mavenCentral() - jcenter() maven { url = 'https://plugins.gradle.org/m2/' } @@ -24,10 +23,9 @@ buildscript { } plugins { - id "com.github.hierynomus.license" version "0.15.0" - id "io.gitlab.arturbosch.detekt" version "1.14.2" + id "com.github.hierynomus.license" version "0.16.1" + id "io.gitlab.arturbosch.detekt" version "1.16.0" id "org.sonarqube" version "2.7" - id "com.jfrog.bintray" version "1.8.4" id "maven-publish" } @@ -44,7 +42,7 @@ description = "Listenable data structures using Kotlin coroutines" repositories { mavenCentral() - jcenter() + maven { url "https://maven.pkg.jetbrains.space/public/p/kotlinx-html/maven" } } dependencies { @@ -70,12 +68,13 @@ tasks.withType(JavaCompile) { compileKotlin.kotlinOptions { allWarningsAsErrors = true jvmTarget = "$ext.jvm_version" - freeCompilerArgs += ["-Xuse-experimental=kotlin.Experimental"] + freeCompilerArgs += ["-Xuse-experimental=kotlin.Experimental", "-Xopt-in=kotlin.RequiresOptIn"] } compileTestKotlin.kotlinOptions { jvmTarget = "$ext.jvm_version" - freeCompilerArgs += ["-Xuse-experimental=kotlin.Experimental"] + freeCompilerArgs += ["-Xuse-experimental=kotlin.Experimental", "-Xopt-in=kotlin.RequiresOptIn"] + } test { @@ -154,24 +153,6 @@ artifacts { archives javadocJar } -bintray { - user = project.properties['bintray.user'] - key = project.properties['bintray.key'] - publications = ['mavenPublication'] - pkg { - repo = project.name - name = project.name - userOrg = 'gladed' - licenses = [ 'Apache-2.0' ] - vcsUrl = 'https://github.com/gladed/watchable.git' - version { - name = project.version - desc = project.version - released = new Date() - } - } -} - publishing { publications { mavenPublication(MavenPublication) { diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 3391a4c..afba109 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 4174cda..c7d437b 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Fri Oct 14 14:13:22 PDT 2016 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.4-bin.zip +networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip diff --git a/gradlew b/gradlew index e0fa707..65dcd68 100755 --- a/gradlew +++ b/gradlew @@ -1,102 +1,129 @@ -#!/usr/bin/env bash +#!/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. +# ############################################################################## -## -## 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/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="" +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +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 -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit + +# 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"' # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum -warn ( ) { +warn () { echo "$*" -} +} >&2 -die ( ) { +die () { echo echo "$*" echo exit 1 -} - -uri_parse() { - # uri capture - uri="$@" - - # safe escaping - uri="${uri//\`/%60}" - uri="${uri//\"/%22}" - - # top level parsing - pattern='^(([a-z]{3,5})://)?((([^:\/]+)(:([^@\/]*))?@)?([^:\/?]+)(:([0-9]+))?)(\/[^?]*)?(\?[^#]*)?(#.*)?$' - [[ "$uri" =~ $pattern ]] || return 1; - - # component extraction - uri=${BASH_REMATCH[0]} - uri_schema=${BASH_REMATCH[2]} - uri_address=${BASH_REMATCH[3]} - uri_user=${BASH_REMATCH[5]} - uri_password=${BASH_REMATCH[7]} - uri_host=${BASH_REMATCH[8]} - uri_port=${BASH_REMATCH[10]} - uri_path=${BASH_REMATCH[11]} - uri_query=${BASH_REMATCH[12]} - uri_fragment=${BASH_REMATCH[13]} - return 0; -} - -JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac -# 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 -done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null - 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 @@ -105,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" + 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. Please set the JAVA_HOME variable in your environment to match the @@ -113,86 +140,105 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "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=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=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 - -# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules -function splitJvmOpts() { - JVM_OPTS=("$@") -} -eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS -JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" - -if [[ -n "$HTTP_PROXY" ]] && uri_parse "$HTTP_PROXY" ; then - JVM_OPTS[${#JVM_OPTS[*]}]="-Dhttp.proxyPort=$uri_port" - JVM_OPTS[${#JVM_OPTS[*]}]="-Dhttp.proxyHost=$uri_host" fi -if [[ -n "$HTTPS_PROXY" ]] && uri_parse "$HTTPS_PROXY" ; then - JVM_OPTS[${#JVM_OPTS[*]}]="-Dhttps.proxyPort=$uri_port" - JVM_OPTS[${#JVM_OPTS[*]}]="-Dhttps.proxyHost=$uri_host" +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +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 -exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" +# 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 aec9973..6689b85 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,4 +1,20 @@ -@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 + +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -8,20 +24,24 @@ @rem Set local scope for the variables with windows NT shell if "%OS%"=="Windows_NT" setlocal -@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 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="-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. @@ -35,7 +55,7 @@ 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% @@ -45,44 +65,26 @@ echo location of your Java installation. goto fail -:init -@rem Get command-line arguments, handling Windowz variants - -if not "%OS%" == "Windows_NT" goto win9xME_args -if "%@eval[2+2]" == "4" goto 4NT_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=%* -goto execute - -:4NT_args -@rem Get arguments from the 4NT Shell from JP Software -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/sample/build.gradle b/sample/build.gradle index 7ec1f12..74db7a2 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -1,7 +1,10 @@ buildscript { ext.kotlin_version = '1.4.10' repositories { - jcenter() + mavenCentral() + maven { + url = 'https://plugins.gradle.org/m2/' + } } } @@ -11,17 +14,16 @@ plugins { } repositories { - jcenter() - maven { url "https://dl.bintray.com/kotlin/ktor" } mavenCentral() + maven { url "https://dl.bintray.com/kotlin/ktor" } + maven { url "https://maven.pkg.jetbrains.space/public/p/kotlinx-html/maven" } } -def ktor_version = '1.3.2' +def ktor_version = '1.4.3' def logback_version = '1.2.3' kotlin { jvm { - withJava() compilations.all { kotlinOptions { freeCompilerArgs += ["-Xopt-in=kotlin.RequiresOptIn"] diff --git a/sample/src/jvmTest/kotlin/AdapterTest.kt b/sample/src/jvmTest/kotlin/AdapterTest.kt index 4f32526..9af0efa 100644 --- a/sample/src/jvmTest/kotlin/AdapterTest.kt +++ b/sample/src/jvmTest/kotlin/AdapterTest.kt @@ -16,7 +16,6 @@ import external.Adapter import kotlinx.coroutines.runBlocking -import kotlinx.serialization.UnstableDefault import kotlinx.serialization.json.Json import model.Bird import model.Chirp @@ -25,7 +24,6 @@ import org.junit.Rule import org.junit.Test import org.junit.rules.TemporaryFolder -@OptIn(UnstableDefault::class) class AdapterTest { @Rule @JvmField val folder = TemporaryFolder() diff --git a/sample/src/jvmTest/kotlin/ApiTest.kt b/sample/src/jvmTest/kotlin/ApiTest.kt index 3ba029c..f817e7a 100644 --- a/sample/src/jvmTest/kotlin/ApiTest.kt +++ b/sample/src/jvmTest/kotlin/ApiTest.kt @@ -6,7 +6,6 @@ import io.ktor.server.testing.handleRequest import io.ktor.server.testing.setBody import io.ktor.server.testing.withTestApplication import kotlinx.serialization.KSerializer -import kotlinx.serialization.UnstableDefault import kotlinx.serialization.json.Json import org.junit.Rule import org.junit.Test @@ -18,7 +17,6 @@ import rest.CreateChirp import rest.Home import kotlin.test.assertEquals -@OptIn(UnstableDefault::class) class ApiTest { @Rule @JvmField val folder = TemporaryFolder() diff --git a/src/main/kotlin/io/gladed/watchable/store/HoldingStore.kt b/src/main/kotlin/io/gladed/watchable/store/HoldingStore.kt index f4fe172..84918fc 100644 --- a/src/main/kotlin/io/gladed/watchable/store/HoldingStore.kt +++ b/src/main/kotlin/io/gladed/watchable/store/HoldingStore.kt @@ -82,6 +82,7 @@ class HoldingStore( /** A [Store] whose objects are held when accessing them. */ private inner class SingleStore(val scope: CoroutineScope) : Store { + @Suppress("SwallowedException") override suspend fun put(key: String, value: T) { // First, test to see if there's a value present. try { diff --git a/src/main/kotlin/io/gladed/watchable/store/MultiHold.kt b/src/main/kotlin/io/gladed/watchable/store/MultiHold.kt index 4ea4f81..7d7c1d3 100644 --- a/src/main/kotlin/io/gladed/watchable/store/MultiHold.kt +++ b/src/main/kotlin/io/gladed/watchable/store/MultiHold.kt @@ -64,7 +64,7 @@ internal class MultiHold(val hold: Deferred>) { suspend fun stop() { // If the request isn't done then cancel it hold.cancel() - @Suppress("EmptyCatchBlock") + @Suppress("SwallowedException", "EmptyCatchBlock") try { // Stop watching if not already cancelled if (!hold.isCancelled) {