diff --git a/app/build.gradle.kts b/app/build.gradle.kts index aca2b4eb..bd489fe4 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -1,9 +1,9 @@ plugins { id("com.android.application") - id("kotlin-android") - id("kotlin-parcelize") + id("com.google.devtools.ksp") + kotlin("android") + kotlin("plugin.parcelize") kotlin("plugin.serialization") - id("com.google.devtools.ksp") version "1.7.10-1.0.6" } android { @@ -124,7 +124,7 @@ dependencies { // Use java.time.* on Android <= 8 // https://developer.android.com/studio/write/java8-support#library-desugaring-versions - coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:1.1.5") + coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:1.2.0") Dependencies.Koin(this) Dependencies.Ktor(this) diff --git a/app/src/main/java/com/xinto/opencord/ui/screens/SettingsScreen.kt b/app/src/main/java/com/xinto/opencord/ui/screens/SettingsScreen.kt index 39f566b6..86964ccf 100644 --- a/app/src/main/java/com/xinto/opencord/ui/screens/SettingsScreen.kt +++ b/app/src/main/java/com/xinto/opencord/ui/screens/SettingsScreen.kt @@ -18,7 +18,7 @@ fun Settings( Scaffold( modifier = modifier, topBar = { - SmallTopAppBar( + TopAppBar( title = { Text(stringResource(R.string.settings_title)) }, navigationIcon = { IconButton(onClick = onBackClick) { diff --git a/app/src/main/java/com/xinto/opencord/ui/screens/home/panels/chat/Chat.kt b/app/src/main/java/com/xinto/opencord/ui/screens/home/panels/chat/Chat.kt index 4b378235..4e37e714 100644 --- a/app/src/main/java/com/xinto/opencord/ui/screens/home/panels/chat/Chat.kt +++ b/app/src/main/java/com/xinto/opencord/ui/screens/home/panels/chat/Chat.kt @@ -33,7 +33,7 @@ fun Chat( Scaffold( modifier = modifier, topBar = { - SmallTopAppBar( + TopAppBar( title = { Text(stringResource(R.string.chat_title, viewModel.channelName)) }, navigationIcon = { IconButton(onChannelsButtonClick) { diff --git a/app/src/main/java/com/xinto/opencord/ui/screens/login/LoginScreen.kt b/app/src/main/java/com/xinto/opencord/ui/screens/login/LoginScreen.kt index ef480314..341aa707 100644 --- a/app/src/main/java/com/xinto/opencord/ui/screens/login/LoginScreen.kt +++ b/app/src/main/java/com/xinto/opencord/ui/screens/login/LoginScreen.kt @@ -33,7 +33,7 @@ fun LoginScreen( modifier = Modifier.fillMaxSize(), topBar = { Column(modifier = Modifier.fillMaxWidth()) { - SmallTopAppBar( + TopAppBar( title = { Text(stringResource(R.string.login_action_login)) }, navigationIcon = { IconButton( diff --git a/app/src/main/java/com/xinto/opencord/ui/screens/pins/PinsScreen.kt b/app/src/main/java/com/xinto/opencord/ui/screens/pins/PinsScreen.kt index bd977124..7c73f7bb 100644 --- a/app/src/main/java/com/xinto/opencord/ui/screens/pins/PinsScreen.kt +++ b/app/src/main/java/com/xinto/opencord/ui/screens/pins/PinsScreen.kt @@ -35,7 +35,7 @@ fun PinsScreen( modifier = modifier .nestedScroll(scrollBehavior.nestedScrollConnection), topBar = { - SmallTopAppBar( + TopAppBar( title = { Text(stringResource(R.string.pins_title)) }, navigationIcon = { IconButton(onClick = onBackClick) { diff --git a/bottom-dialog-compose/build.gradle.kts b/bottom-dialog-compose/build.gradle.kts index 373acba4..4d903992 100644 --- a/bottom-dialog-compose/build.gradle.kts +++ b/bottom-dialog-compose/build.gradle.kts @@ -39,10 +39,13 @@ android { kotlinOptions { jvmTarget = "11" - freeCompilerArgs = freeCompilerArgs + "-Xexplicit-api=strict" } } +kotlin { + explicitApi() +} + dependencies { implementation(Dependencies.Material.material) implementation(Dependencies.Compose.foundation) diff --git a/build.gradle.kts b/build.gradle.kts index f2730642..57aa8bc1 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,17 +1,3 @@ -buildscript { - repositories { - google() - mavenCentral() - } - dependencies { - classpath("com.android.tools.build:gradle:7.2.2") - - val kotlinVersion = "1.7.10" - classpath(kotlin("gradle-plugin", version = kotlinVersion)) - classpath(kotlin("serialization", version = kotlinVersion)) - } -} - allprojects { repositories { google() @@ -22,4 +8,4 @@ allprojects { task("clean") { delete(rootProject.buildDir) -} \ No newline at end of file +} diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 0c18b032..b7bd4752 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -13,4 +13,4 @@ tasks.withType().all { repositories { google() mavenCentral() -} \ No newline at end of file +} diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt index dc172109..6e6955d6 100644 --- a/buildSrc/src/main/kotlin/Dependencies.kt +++ b/buildSrc/src/main/kotlin/Dependencies.kt @@ -2,9 +2,8 @@ import org.gradle.kotlin.dsl.DependencyHandlerScope @Suppress("MemberVisibilityCanBePrivate") sealed class Dependencies { - object Ktor : Dependencies() { - const val version = "2.1.3" + const val version = "2.2.1" const val ktorClientCore = "io.ktor:ktor-client-core:$version" const val ktorClientOkHttp = "io.ktor:ktor-client-okhttp:$version" @@ -27,7 +26,7 @@ sealed class Dependencies { object KotlinX : Dependencies() { const val datetimeVersion = "0.4.0" - const val serializationVersion = "1.3.3" + const val serializationVersion = "1.4.1" const val immutableVersion = "0.3.5" const val datetime = "org.jetbrains.kotlinx:kotlinx-datetime:$datetimeVersion" @@ -44,7 +43,7 @@ sealed class Dependencies { } object AndroidxCore : Dependencies() { - const val version = "1.8.0" + const val version = "1.9.0" const val core = "androidx.core:core:$version" const val coreKtx = "androidx.core:core-ktx:$version" @@ -92,19 +91,18 @@ sealed class Dependencies { } object Compose : Dependencies() { - const val version = "1.2.1" - const val compilerVersion = "1.3.0" + const val compilerVersion = "1.3.2" - const val activity = "androidx.activity:activity-compose:1.5.1" - const val animation = "androidx.compose.animation:animation:$version" + const val activity = "androidx.activity:activity-compose:1.6.1" + const val animation = "androidx.compose.animation:animation:1.3.2" const val compiler = "androidx.compose.compiler:compiler:$compilerVersion" - const val foundation = "androidx.compose.foundation:foundation:$version" - const val material = "androidx.compose.material:material:$version" - const val material3 = "androidx.compose.material3:material3:1.0.0-alpha16" - const val runtime = "androidx.compose.runtime:runtime:$version" - const val ui = "androidx.compose.ui:ui:$version" - const val uiText = "androidx.compose.ui:ui-text:$version" - const val uiUtil = "androidx.compose.ui:ui-util:$version" + const val foundation = "androidx.compose.foundation:foundation:1.3.1" + const val material = "androidx.compose.material:material:1.3.1" + const val material3 = "androidx.compose.material3:material3:1.0.1" + const val runtime = "androidx.compose.runtime:runtime:1.3.2" + const val ui = "androidx.compose.ui:ui:1.3.2" + const val uiText = "androidx.compose.ui:ui-text:1.3.2" + const val uiUtil = "androidx.compose.ui:ui-util:1.3.2" override fun invoke(scope: DependencyHandlerScope) { scope { @@ -122,7 +120,7 @@ sealed class Dependencies { } object Accompanist : Dependencies() { - const val version = "0.25.1" + const val version = "0.28.0" const val systemUiController = "com.google.accompanist:accompanist-systemuicontroller:$version" const val placeholder = "com.google.accompanist:accompanist-placeholder:$version" @@ -148,7 +146,7 @@ sealed class Dependencies { } object Material : Dependencies() { - const val version = "1.5.0" + const val version = "1.7.0" const val material = "com.google.android.material:material:$version" @@ -160,7 +158,7 @@ sealed class Dependencies { } object Coil : Dependencies() { - const val version = "2.1.0" + const val version = "2.2.2" const val coilBase = "io.coil-kt:coil:$version" const val coilCompose = "io.coil-kt:coil-compose:$version" @@ -174,7 +172,7 @@ sealed class Dependencies { } object AndroidxMedia3 : Dependencies() { - const val version = "1.0.0-beta02" + const val version = "1.0.0-beta03" const val media3exo = "androidx.media3:media3-exoplayer:$version" const val media3exoDash = "androidx.media3:media3-exoplayer-dash:$version" @@ -190,6 +188,8 @@ sealed class Dependencies { } object Koin : Dependencies() { + // DO NOT UPGRADE + // it ships with androidx.navigation for no fucking reason const val version = "3.2.0" const val koin = "io.insert-koin:koin-android:$version" @@ -204,7 +204,7 @@ sealed class Dependencies { } object HCaptcha : Dependencies() { - const val version = "3.3.5" + const val version = "3.3.6" const val hCaptchaSdk = "com.github.hcaptcha:hcaptcha-android-sdk:$version" @@ -243,15 +243,14 @@ sealed class Dependencies { } } - //TODO migrate to context receivers after upgrading to kotlin 1.6.20 + // TODO: use context receivers when they are enabled by default + // cannot enable them for build.gradle.kts abstract operator fun invoke(scope: DependencyHandlerScope) - //TODO migrate to context receivers after upgrading to kotlin 1.6.20 protected fun DependencyHandlerScope.implementation(dependencyNotation: String) { "implementation"(dependencyNotation) } - //TODO migrate to context receivers after upgrading to kotlin 1.6.20 protected fun DependencyHandlerScope.ksp(dependencyNotation: String) { "ksp"(dependencyNotation) } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index e708b1c0..943f0cbf 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 cb6be7a5..f398c33c 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Thu Aug 11 09:24:16 GET 2022 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip distributionPath=wrapper/dists -zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip +networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 4f906e0c..65dcd68d 100755 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ -#!/usr/bin/env sh +#!/bin/sh # -# Copyright 2015 the original author or authors. +# 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. @@ -17,67 +17,101 @@ # ############################################################################## -## -## 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/. +# ############################################################################## # 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"` +# 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 () { 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 @@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar 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 @@ -98,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 @@ -106,80 +140,105 @@ 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 +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" = "true" -o "$msys" = "true" ] ; 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 +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + # 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=`expr $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; +# * $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 + +# 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. +# -# 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" +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 107acd32..93e3f59f 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +25,8 @@ 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% @@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :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/overlapping-panels-compose/build.gradle.kts b/overlapping-panels-compose/build.gradle.kts index 2e123772..d7c71e84 100644 --- a/overlapping-panels-compose/build.gradle.kts +++ b/overlapping-panels-compose/build.gradle.kts @@ -39,8 +39,9 @@ android { kotlinOptions { jvmTarget = "11" - freeCompilerArgs = freeCompilerArgs + - "-opt-in=androidx.compose.material.ExperimentalMaterialApi" + freeCompilerArgs += listOf( + "-opt-in=androidx.compose.material.ExperimentalMaterialApi" + ) } } diff --git a/settings.gradle.kts b/settings.gradle.kts index a9ccb64e..57cdc39c 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,3 +1,25 @@ +pluginManagement { + plugins { + val agpVersion = "7.3.1" + id("com.android.application") version agpVersion apply false + id("com.android.library") version agpVersion apply false + + val kotlinVersion = "1.7.20" + kotlin("android") version kotlinVersion apply false + kotlin("plugin.parcelize") version kotlinVersion apply false + kotlin("plugin.serialization") version kotlinVersion apply false + kotlin("gradle-plugin") version kotlinVersion apply false + + val kspVersion = "1.7.20-1.0.7" + id("com.google.devtools.ksp") version kspVersion apply false + } + repositories { + google() + mavenCentral() + gradlePluginPortal() + } +} + rootProject.name = "OpenCord" include(":app") include(":simpleast-compose") diff --git a/simpleast-compose/build.gradle.kts b/simpleast-compose/build.gradle.kts index 4b4464bd..2b9cfd2f 100644 --- a/simpleast-compose/build.gradle.kts +++ b/simpleast-compose/build.gradle.kts @@ -34,12 +34,16 @@ android { kotlinOptions { jvmTarget = "11" - freeCompilerArgs = freeCompilerArgs + - "-Xexplicit-api=strict" + - "-Xcontext-receivers" + freeCompilerArgs += listOf( + "-Xcontext-receivers" + ) } } +kotlin { + explicitApi() +} + dependencies { implementation(Dependencies.Compose.uiText) }