Merge pull request #18 from MoyuruAizawa/update-libs

update libs
MoyuruAizawa · Apr 8, 2024 · bb2c659 · bb2c659
2 parents fde464c + 4c0c676
commit bb2c659
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 29 deletions.
diff --git a/.github/workflows/vital_check.yml b/.github/workflows/vital_check.yml
@@ -15,7 +15,7 @@ jobs:
       - uses: actions/setup-java@v3
         with:
           distribution: 'zulu'
-          java-version: '11'
+          java-version: '17'
 
       - uses: gradle/gradle-build-action@v2
         with:

diff --git a/app/build.gradle b/app/build.gradle
@@ -5,12 +5,12 @@ plugins {
 
 android {
   namespace 'io.moyuru.cropifysample'
-  compileSdk 33
+  compileSdk 34
 
   defaultConfig {
     applicationId "io.moyuru.cropifysample"
     minSdk 21
-    targetSdk 33
+    targetSdk 34
     versionCode 1
     versionName "1.0"
 
@@ -48,17 +48,18 @@ android {
 
 dependencies {
   implementation project(":cropify")
-  implementation 'androidx.core:core-ktx:1.9.0'
-  implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.1'
-  implementation 'androidx.activity:activity-compose:1.7.0'
-  implementation "androidx.navigation:navigation-compose:2.5.3"
-  implementation "androidx.compose.ui:ui:$compose_version"
-  implementation "androidx.compose.ui:ui-tooling-preview:$compose_version"
-  implementation "androidx.compose.foundation:foundation:$compose_version"
-  implementation "androidx.compose.runtime:runtime:$compose_version"
-  implementation "androidx.compose.runtime:runtime-livedata:$compose_version"
-  implementation 'androidx.compose.material:material:1.4.1'
-  implementation 'androidx.compose.material3:material3:1.1.0-beta01'
-  debugImplementation "androidx.compose.ui:ui-tooling:$compose_version"
-  testImplementation "org.junit.jupiter:junit-jupiter-api:5.4.2"
+  implementation 'androidx.core:core-ktx:1.12.0'
+  implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.7.0'
+  implementation 'androidx.activity:activity-compose:1.8.2'
+  implementation "androidx.navigation:navigation-compose:2.7.7"
+  implementation platform("androidx.compose:compose-bom:$compose_version")
+  implementation "androidx.compose.ui:ui"
+  implementation "androidx.compose.ui:ui-tooling-preview"
+  implementation "androidx.compose.foundation:foundation"
+  implementation "androidx.compose.runtime:runtime"
+  implementation "androidx.compose.runtime:runtime-livedata"
+  implementation 'androidx.compose.material:material:1.6.5'
+  implementation 'androidx.compose.material3:material3:1.2.1'
+  debugImplementation "androidx.compose.ui:ui-tooling"
+  testImplementation "org.junit.jupiter:junit-jupiter-api:5.10.2"
 }
diff --git a/build.gradle b/build.gradle
@@ -1,10 +1,10 @@
 buildscript {
   ext {
-    compose_version = '1.4.1'
+    compose_version = '2024.03.00'
   }
 }// Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-  id 'com.android.application' version '7.4.2' apply false
-  id 'com.android.library' version '7.4.2' apply false
+  id 'com.android.application' version '8.2.2' apply false
+  id 'com.android.library' version '8.2.2' apply false
   id 'org.jetbrains.kotlin.android' version '1.8.10' apply false
 }
diff --git a/cropify/build.gradle b/cropify/build.gradle
@@ -36,15 +36,16 @@ android {
 }
 
 dependencies {
-  implementation 'androidx.core:core-ktx:1.10.0'
-  implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.1'
-  implementation 'androidx.activity:activity-compose:1.7.0'
-  implementation "androidx.compose.ui:ui:$compose_version"
-  implementation "androidx.compose.ui:ui-tooling-preview:$compose_version"
-  implementation "androidx.compose.foundation:foundation:$compose_version"
-  debugImplementation "androidx.compose.ui:ui-tooling:$compose_version"
+  implementation 'androidx.core:core-ktx:1.12.0'
+  implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.7.0'
+  implementation 'androidx.activity:activity-compose:1.8.2'
+  implementation platform("androidx.compose:compose-bom:$compose_version")
+  implementation "androidx.compose.ui:ui"
+  implementation "androidx.compose.ui:ui-tooling-preview"
+  implementation "androidx.compose.foundation:foundation"
+  debugImplementation "androidx.compose.ui:ui-tooling"
   testImplementation 'junit:junit:4.13.2'
-  testImplementation "io.mockk:mockk:1.13.5"
+  testImplementation "io.mockk:mockk:1.13.10"
   androidTestImplementation 'androidx.test.ext:junit:1.1.5'
   androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
 }
diff --git a/gradle.properties b/gradle.properties
@@ -20,4 +20,6 @@ kotlin.code.style=official
 # Enables namespacing of each library's R class so that its R class includes only the
 # resources declared in the library itself and none from the library's dependencies,
 # thereby reducing the size of the R class for that library
-android.nonTransitiveRClass=true
+android.nonTransitiveRClass=true
+android.defaults.buildfeatures.buildconfig=true
+android.nonFinalResIds=false
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Mon Mar 13 23:36:42 JST 2023
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME