diff --git a/app/src/main/java/com/anytypeio/anytype/ui/sets/modals/filter/ModifyFilterFromSelectedValueFragment.kt b/app/src/main/java/com/anytypeio/anytype/ui/sets/modals/filter/ModifyFilterFromSelectedValueFragment.kt index fc037947cb..1f06e67c85 100644 --- a/app/src/main/java/com/anytypeio/anytype/ui/sets/modals/filter/ModifyFilterFromSelectedValueFragment.kt +++ b/app/src/main/java/com/anytypeio/anytype/ui/sets/modals/filter/ModifyFilterFromSelectedValueFragment.kt @@ -147,6 +147,7 @@ open class ModifyFilterFromSelectedValueFragment : ctx = ctx, ) } + else -> {} } } diff --git a/app/src/main/java/com/anytypeio/anytype/ui/sets/modals/sort/ModifyViewerSortFragment.kt b/app/src/main/java/com/anytypeio/anytype/ui/sets/modals/sort/ModifyViewerSortFragment.kt index d30b1887f0..036bcb3351 100644 --- a/app/src/main/java/com/anytypeio/anytype/ui/sets/modals/sort/ModifyViewerSortFragment.kt +++ b/app/src/main/java/com/anytypeio/anytype/ui/sets/modals/sort/ModifyViewerSortFragment.kt @@ -59,6 +59,7 @@ class ModifyViewerSortFragment : BaseBottomSheetFragment {} } } } diff --git a/build.gradle b/build.gradle index f874cb94ba..fdc4f5c99f 100644 --- a/build.gradle +++ b/build.gradle @@ -1,16 +1,16 @@ apply from: './dependencies.gradle' buildscript { - ext.kotlin_version = '1.6.10' + ext.kotlin_version = '1.7.10' ext.gradle_tools = '3.1.3' - ext.build_tools = '31.0.0' + ext.build_tools = '32.0.0' ext.nav_version = '2.3.0' ext.dokka_version = '1.4.32' - ext.compile_sdk = 31 + ext.compile_sdk = 32 ext.target_sdk = 31 ext.min_sdk = 26 - ext.compose_version = '1.2.0-alpha03' + ext.compose_version = '1.3.1' ext.application_id = 'com.anytypeio.anytype' ext.version_name = '1.0' @@ -23,7 +23,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.1.3' + classpath 'com.android.tools.build:gradle:7.3.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "androidx.navigation:navigation-safe-args-gradle-plugin:$nav_version" classpath 'com.google.gms:google-services:4.3.13' @@ -31,7 +31,7 @@ buildscript { classpath 'com.google.firebase:firebase-appdistribution-gradle:3.0.3' classpath "org.jetbrains.dokka:dokka-gradle-plugin:${dokka_version}" classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version" - classpath 'com.squareup.wire:wire-gradle-plugin:4.0.1' + classpath 'com.squareup.wire:wire-gradle-plugin:4.4.1' } } diff --git a/core-models/src/main/java/com/anytypeio/anytype/core_models/ext/BlockExt.kt b/core-models/src/main/java/com/anytypeio/anytype/core_models/ext/BlockExt.kt index 26dd22082c..1e8138fb85 100644 --- a/core-models/src/main/java/com/anytypeio/anytype/core_models/ext/BlockExt.kt +++ b/core-models/src/main/java/com/anytypeio/anytype/core_models/ext/BlockExt.kt @@ -93,6 +93,7 @@ fun Map>.asRender(anchor: String): List { is Content.Layout -> { result.addAll(asRender(child.id)) } + else -> {} } } return result diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/text/Callout.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/text/Callout.kt index 3872c9e199..8d47a69960 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/text/Callout.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/text/Callout.kt @@ -142,6 +142,7 @@ class Callout( is BlockView.Decoration.Style.Callout.Full -> { binding.calloutCardContainer.setBackgroundResource(R.drawable.rect_callout_full) } + else -> {} } binding.calloutCardContainer.setBlockBackgroundTintColor( color = last.background, diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/objects/ObjectActionAdapter.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/objects/ObjectActionAdapter.kt index f924c4a560..45057e3f70 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/objects/ObjectActionAdapter.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/objects/ObjectActionAdapter.kt @@ -71,6 +71,7 @@ class ObjectActionAdapter( ObjectAction.MOVE_TO -> { } + else -> {} } } } diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/relations/create/RelationFormatAdapter.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/relations/create/RelationFormatAdapter.kt index a8dcd9ac6d..da8330cb9a 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/relations/create/RelationFormatAdapter.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/relations/create/RelationFormatAdapter.kt @@ -80,6 +80,7 @@ class RelationFormatAdapter( OBJECT -> { name.setText(R.string.relation_format_object) } + else -> {} } // Setting temporarily random color diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/table/holders/TableTextCellHolder.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/table/holders/TableTextCellHolder.kt index 96e3e0c07b..579e43e5dd 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/table/holders/TableTextCellHolder.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/table/holders/TableTextCellHolder.kt @@ -63,6 +63,7 @@ sealed class TableCellHolder(view: View) : RecyclerView.ViewHolder(view) { setBackground(cell.block.background, cell.settings) setAlignment(cell.block.alignment) } + else -> {} } } diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/dv/GalleryViewContentWidget.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/dv/GalleryViewContentWidget.kt index 55b83592bc..4a62c624e7 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/dv/GalleryViewContentWidget.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/dv/GalleryViewContentWidget.kt @@ -337,6 +337,7 @@ class GalleryViewContentWidget @JvmOverloads constructor( marginEnd = marginAfterIcon } } + else -> {} } val noIcon = obj.icon == ObjectIcon.None || obj.icon is ObjectIcon.Basic.Avatar diff --git a/dependencies.gradle b/dependencies.gradle index 9181cde70a..c6684d0734 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -9,7 +9,7 @@ ext { androidx_test_core_version = '1.4.0' androidx_core_testing_version = '2.1.0' androidx_security_crypto_version = '1.0.0' - androidx_compose_version = '1.2.0-alpha03' + androidx_compose_version = '1.2.1' // Other Android framework dependencies appcompat_version = '1.3.0' @@ -22,15 +22,15 @@ ext { view_pager_2_version = '1.0.0' // Architecture Components - lifecycle_version = '2.4.0' + lifecycle_version = '2.5.1' navigation_version = '2.3.5' // Third party libraries exoplayer_version = '2.17.1' - glide_version = '4.12.0' + glide_version = '4.14.1' shimmer_layout_version = "0.5.0" photo_view_version = '2.3.0' - dagger_version = '2.40.5' + dagger_version = '2.44' javaxAnnotations_version = '1.0' javaxInject_version = '1' retrofit_version = '2.3.0' @@ -77,7 +77,7 @@ ext { // DBB - room_version = '2.4.1' + room_version = '2.4.3' // Analytics diff --git a/domain/src/main/java/com/anytypeio/anytype/domain/search/ObjectSearchSubscriptionContainer.kt b/domain/src/main/java/com/anytypeio/anytype/domain/search/ObjectSearchSubscriptionContainer.kt index 0d43d0a6e5..c24f36f4c1 100644 --- a/domain/src/main/java/com/anytypeio/anytype/domain/search/ObjectSearchSubscriptionContainer.kt +++ b/domain/src/main/java/com/anytypeio/anytype/domain/search/ObjectSearchSubscriptionContainer.kt @@ -123,6 +123,7 @@ class ObjectSearchSubscriptionContainer( subscriptions = event.subscriptions ) } + else -> {} } } result diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index f6b961fd5a..7454180f2a 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 f614b1fba5..ae04661ee7 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,5 @@ -#Mon Apr 13 21:05:02 MSK 2020 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip diff --git a/gradlew b/gradlew index cccdd3d517..1b6c787337 100755 --- a/gradlew +++ b/gradlew @@ -1,78 +1,129 @@ -#!/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. +# ############################################################################## -## -## 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/master/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/. +# ############################################################################## # 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_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` +APP_BASE_NAME=${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="" +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 () { 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,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 @@ -89,84 +140,95 @@ location of your Java installation." 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 -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 - -# 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\"" - fi - i=$((i+1)) - 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" ;; +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" 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, 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. -# 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" +# 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" ) -# 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")" + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + 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 + # 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 fi +# 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 \ + "$@" + +# 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..ac1b06f938 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,3 +1,19 @@ +@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 @@ -13,15 +29,18 @@ if "%DIRNAME%" == "" set DIRNAME=. 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%" == "0" goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -35,7 +54,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,28 +64,14 @@ echo location of your Java installation. 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 diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/auth/account/DeletedAccountViewModel.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/auth/account/DeletedAccountViewModel.kt index eedf963e3e..7db41966d4 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/auth/account/DeletedAccountViewModel.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/auth/account/DeletedAccountViewModel.kt @@ -79,6 +79,7 @@ class DeletedAccountViewModel( is AccountStatus.PendingDeletion -> { // TODO } + else -> {} } sendEvent( analytics = analytics, diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/EditorViewModel.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/EditorViewModel.kt index 5f09b2c459..f0c8e2e9ed 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/EditorViewModel.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/EditorViewModel.kt @@ -1555,6 +1555,7 @@ class EditorViewModel( return } } + else -> {} } } @@ -1900,6 +1901,7 @@ class EditorViewModel( cursor = view.text?.length ?: 0 break } + else -> {} } } @@ -2045,6 +2047,7 @@ class EditorViewModel( val pos = update.indexOf(target) searchResultScrollPosition.value = pos } + else -> {} } } @@ -3864,6 +3867,7 @@ class EditorViewModel( is ListenerType.TableTextCellMenu -> { onShowSimpleTableWidgetClicked(id = clicked.cellId) } + else -> {} } } diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/render/DefaultBlockViewRenderer.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/render/DefaultBlockViewRenderer.kt index f3e8e8494a..2d3ca7a446 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/render/DefaultBlockViewRenderer.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/render/DefaultBlockViewRenderer.kt @@ -774,6 +774,7 @@ class DefaultBlockViewRenderer @Inject constructor( ) ) } + else -> {} } } diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/extension/MarkupExtension.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/extension/MarkupExtension.kt index 9cfa09b5b5..06b39d128a 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/extension/MarkupExtension.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/extension/MarkupExtension.kt @@ -128,6 +128,7 @@ fun Block.style(selection: IntRange): MarkupStyleDescriptor { if (overlap.inside()) markupHighlightColor = mark.param } } + else -> {} } } } diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/relations/ObjectSetSettingsViewModel.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/relations/ObjectSetSettingsViewModel.kt index 4910fb8b5a..7e78061cc7 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/relations/ObjectSetSettingsViewModel.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/relations/ObjectSetSettingsViewModel.kt @@ -92,6 +92,7 @@ class ObjectSetSettingsViewModel( result.add(ViewerRelationListView.Section.Settings) result.add(ViewerRelationListView.Setting.Toggle.HideIcon(toggled = viewer.hideIcon)) } + else -> {} } val relations = objectSet .simpleRelations(session.currentViewerId.value) diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/relations/RelationListViewModel.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/relations/RelationListViewModel.kt index 71cecc191f..aa1ea8a372 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/relations/RelationListViewModel.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/relations/RelationListViewModel.kt @@ -260,6 +260,7 @@ class RelationListViewModel( ) ) } + else -> {} } } } diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/sets/ObjectSetViewModel.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/sets/ObjectSetViewModel.kt index 4e32458f20..b472f99c08 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/sets/ObjectSetViewModel.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/sets/ObjectSetViewModel.kt @@ -280,6 +280,7 @@ class ObjectSetViewModel( is Action.SetUnsplashImage -> { proceedWithSettingUnsplashImage(action) } + else -> {} } } } diff --git a/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/mention/MentionExtKtTest.kt b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/mention/MentionExtKtTest.kt index 2c3231e0e3..ec6feb15cc 100644 --- a/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/mention/MentionExtKtTest.kt +++ b/presentation/src/test/java/com/anytypeio/anytype/presentation/editor/editor/mention/MentionExtKtTest.kt @@ -328,6 +328,7 @@ class MentionExtTest { ObjectType.Layout.NOTE -> equalsMentionNoIcon(mark, layout) ObjectType.Layout.SPACE -> equalsMentionNoIcon(mark, layout) ObjectType.Layout.DATABASE -> equalsMentionNoIcon(mark, layout) + else -> {} } } equalsMentionBase(mark, null) diff --git a/sample/build.gradle b/sample/build.gradle index f3bc22449f..40ff6a2e74 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -4,8 +4,8 @@ apply plugin: 'kotlin-android-extensions' apply plugin: 'kotlin-kapt' android { - compileSdkVersion 31 - buildToolsVersion "31.0.0" + compileSdkVersion 32 + buildToolsVersion "32.0.0" defaultConfig {