Browse Source

updated dependencies

sirekanian 2 years ago
parent
commit
84b44c011a

+ 8 - 0
.github/workflows/build.yml

@@ -6,6 +6,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
+      - uses: actions/setup-java@v3
+        with:
+          distribution: 'temurin'
+          java-version: '17'
       - shell: bash
         run: ./gradlew lintDebug
       - if: ${{ always() }}
@@ -16,6 +20,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
+      - uses: actions/setup-java@v3
+        with:
+          distribution: 'temurin'
+          java-version: '17'
       - shell: bash
         run: ./gradlew assembleRelease
       - shell: bash

+ 1 - 1
.github/workflows/tests.yml

@@ -9,7 +9,7 @@ jobs:
       - uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
-          java-version: '11'
+          java-version: '17'
       - shell: bash
         run: ./emulator
       - shell: bash

+ 1 - 0
.gitignore

@@ -8,3 +8,4 @@
 .externalNativeBuild
 .cxx
 local.properties
+/tmp

+ 4 - 3
app/build.gradle

@@ -39,8 +39,8 @@ android {
         sourceCompatibility JavaVersion.VERSION_11
         targetCompatibility JavaVersion.VERSION_11
     }
-    kotlinOptions {
-        jvmTarget = '11'
+    kotlin {
+        jvmToolchain(11)
     }
     buildFeatures {
         compose true
@@ -65,7 +65,7 @@ dependencies {
 
     // androidx compose
     implementation "androidx.compose.material:material:$composeMaterialVersion"
-    implementation 'androidx.activity:activity-compose:1.7.0'
+    implementation 'androidx.activity:activity-compose:1.7.1'
 
     // androidx room
     implementation "androidx.room:room-runtime:$roomVersion"
@@ -83,4 +83,5 @@ dependencies {
     androidTestImplementation("androidx.test.ext:junit:1.1.5")
     androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
     androidTestImplementation("androidx.test.uiautomator:uiautomator:2.2.0")
+
 }

+ 5 - 5
build.gradle

@@ -1,9 +1,9 @@
 buildscript {
     ext {
-        androidPluginVersion = '7.4.2'
-        kotlinVersion = '1.8.10'
-        composeCompilerVersion = '1.4.4'
-        composeMaterialVersion = '1.4.1'
+        androidPluginVersion = '8.0.0'
+        kotlinVersion = '1.8.20'
+        composeCompilerVersion = '1.4.6'
+        composeMaterialVersion = '1.4.2'
         roomVersion = '2.5.1'
     }
 }
@@ -14,7 +14,7 @@ plugins {
     // TODO: 1202468796234411
     // id 'org.jetbrains.kotlin.plugin.serialization' version "$kotlinVersion" apply false
     id 'org.jetbrains.kotlin.kapt' version "$kotlinVersion" apply false
-    id 'org.sirekanyan.version-checker' version "1.0.0" apply false
+    id 'org.sirekanyan.version-checker' version "1.0.3" apply false
 }
 
 task clean(type: Delete) {

BIN
gradle/wrapper/gradle-wrapper.jar


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

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-all.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

+ 4 - 3
gradlew

@@ -85,9 +85,6 @@ done
 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
 
@@ -197,6 +194,10 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
+
+# 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"'
+
 # 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