浏览代码

updated kotlin, gradle, compose, etc

sirekanian 3 年之前
父节点
当前提交
db3bfb279d
共有 5 个文件被更改,包括 18 次插入10 次删除
  1. 1 1
      app/build.gradle
  2. 3 3
      build.gradle
  3. 二进制
      gradle/wrapper/gradle-wrapper.jar
  4. 6 0
      gradlew
  5. 8 6
      gradlew.bat

+ 1 - 1
app/build.gradle

@@ -72,7 +72,7 @@ dependencies {
     kapt "androidx.room:room-compiler:2.4.3"
 
     // coil
-    implementation "io.coil-kt:coil-compose:2.2.1"
+    implementation "io.coil-kt:coil-compose:2.2.2"
 
     // datetime
     implementation 'org.jetbrains.kotlinx:kotlinx-datetime:0.4.0'

+ 3 - 3
build.gradle

@@ -1,8 +1,8 @@
 buildscript {
     ext {
-        androidPluginVersion = '7.3.0'
-        kotlinLanguageVersion = '1.7.10'
-        composeCompilerVersion = '1.3.1'
+        androidPluginVersion = '7.3.1'
+        kotlinLanguageVersion = '1.7.20'
+        composeCompilerVersion = '1.3.2'
         composeLibraryVersion = '1.2.1'
     }
 }

二进制
gradle/wrapper/gradle-wrapper.jar


+ 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