Explorar o código

updated kotlin, gradle and libraries

sirekanian %!s(int64=3) %!d(string=hai) anos
pai
achega
11f5513dba
Modificáronse 6 ficheiros con 21 adicións e 13 borrados
  1. 1 1
      app/build.gradle
  2. 5 5
      build.gradle
  3. BIN=BIN
      gradle/wrapper/gradle-wrapper.jar
  4. 1 1
      gradle/wrapper/gradle-wrapper.properties
  5. 6 0
      gradlew
  6. 8 6
      gradlew.bat

+ 1 - 1
app/build.gradle

@@ -59,7 +59,7 @@ dependencies {
 
     // androidx compose
     implementation "androidx.compose.material:material:$composeVersion"
-    implementation 'androidx.activity:activity-compose:1.4.0'
+    implementation 'androidx.activity:activity-compose:1.5.1'
 
     // androidx room
     implementation "androidx.room:room-runtime:$roomVersion"

+ 5 - 5
build.gradle

@@ -1,10 +1,10 @@
 buildscript {
     ext {
-        androidPluginVersion = '7.2.1'
-        kotlinVersion = '1.6.21'
-        composeVersion = '1.2.0-rc02'
-        roomVersion = '2.4.2'
-        ktorVersion = '2.0.1'
+        androidPluginVersion = '7.2.2'
+        kotlinVersion = '1.7.0'
+        composeVersion = '1.2.0'
+        roomVersion = '2.4.3'
+        ktorVersion = '2.0.3'
     }
 }
 

BIN=BIN
gradle/wrapper/gradle-wrapper.jar


+ 1 - 1
gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

+ 6 - 0
gradlew

@@ -205,6 +205,12 @@ set -- \
         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.

+ 8 - 6
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,7 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,7 +40,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 +75,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