Merge pull request #9 from keiji/update_project

Update project
keiji · Jan 22, 2024 · b46d148 · b46d148
2 parents 3332e8d + fbe5642
commit b46d148
Show file tree

Hide file tree

Showing 11 changed files with 70 additions and 23 deletions.
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -26,11 +26,11 @@ jobs:
         key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
         restore-keys: |
           ${{ runner.os }}-gradle-
-    - name: set up JDK 11
+    - name: set up JDK 17
       uses: actions/setup-java@v3
       with:
-        java-version: '11'
-        distribution: 'temurin'
+        java-version: '17'
+        distribution: 'zulu'
         cache: gradle
 
     - name: Grant execute permission for gradlew

diff --git a/android-app/.idea/androidTestResultsUserPreferences.xml b/android-app/.idea/androidTestResultsUserPreferences.xml
diff --git a/android-app/.idea/compiler.xml b/android-app/.idea/compiler.xml
diff --git a/android-app/.idea/deploymentTargetDropDown.xml b/android-app/.idea/deploymentTargetDropDown.xml
diff --git a/android-app/.idea/gradle.xml b/android-app/.idea/gradle.xml
diff --git a/android-app/.idea/kotlinc.xml b/android-app/.idea/kotlinc.xml
diff --git a/android-app/.idea/migrations.xml b/android-app/.idea/migrations.xml
diff --git a/android-app/.idea/misc.xml b/android-app/.idea/misc.xml
diff --git a/android-app/app/build.gradle b/android-app/app/build.gradle
@@ -6,12 +6,12 @@ plugins {
 android {
     namespace 'dev.keiji.javacard'
 
-    compileSdk 33
+    compileSdk 34
 
     defaultConfig {
         applicationId "dev.keiji.javacard"
         minSdk 23
-        targetSdk 33
+        targetSdk 34
         versionCode 1
         versionName "1.0"
 
@@ -25,23 +25,23 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = JavaVersion.VERSION_17
     }
 }
 
 dependencies {
     implementation project(":apdu-command")
 
-    implementation 'androidx.core:core-ktx:1.10.1'
+    implementation 'androidx.core:core-ktx:1.12.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
-    implementation 'com.google.android.material:material:1.9.0'
+    implementation 'com.google.android.material:material:1.11.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.0'
-    implementation 'androidx.activity:activity-ktx:1.7.1'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3'
+    implementation 'androidx.activity:activity-ktx:1.8.2'
 
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'

diff --git a/android-app/build.gradle b/android-app/build.gradle
@@ -1,8 +1,8 @@
 // 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 'org.jetbrains.kotlin.android' version '1.8.20' apply false
+    id 'com.android.application' version '8.2.1' apply false
+    id 'com.android.library' version '8.2.1' apply false
+    id 'org.jetbrains.kotlin.android' version '1.9.22' apply false
 }
 
 Properties sonaTypeProps = new Properties()

diff --git a/android-app/gradle/wrapper/gradle-wrapper.properties b/android-app/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sun Aug 14 14:44:43 JST 2022
+#Tue Jan 23 00:43:07 JST 2024
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists