#60275【Android_APIlevel34】ABook Check/eXFrame

924a75b7 · Kim Jinsung · 60693cb5 · 924a75b7 · 924a75b7 · 924a75b7
Commit 924a75b7 authored Aug 21, 2024 by Kim Jinsung
13 changed files
--- a/ABVJE_BL/build.gradle
+++ b/ABVJE_BL/build.gradle
 apply plugin: 'java'
-sourceCompatibility = 1.6
-targetCompatibility = 1.6
 version = '1.0'
 dependencies {

--- a/ABVJE_BL/src/jp/agentec/abook/abv/bl/download/ContentRefresher.java
+++ b/ABVJE_BL/src/jp/agentec/abook/abv/bl/download/ContentRefresher.java
@@ -5,7 +5,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
-import jdk.nashorn.internal.codegen.CompilerConstants;
 import jp.agentec.abook.abv.bl.acms.client.AcmsClient;
 import jp.agentec.abook.abv.bl.acms.client.json.ContentVersionsJSON;
 import jp.agentec.abook.abv.bl.acms.client.parameters.ContentDownloadLogParameters;

--- a/ABVJE_Launcher_Android/build.gradle
+++ b/ABVJE_Launcher_Android/build.gradle
-buildscript {
-    repositories {
-        jcenter()
-    }
-    dependencies {
-        classpath 'org.ajoberstar:gradle-git:0.12+'
-        classpath 'com.google.gms:google-services:4.0.1'
-    }
-}
 apply plugin: 'com.android.application'
 apply plugin: 'com.google.gms.google-services'
@@ -17,11 +7,10 @@ dependencies {
 }
 android {
-    compileSdkVersion 33
    defaultConfig {
        minSdkVersion 23
-        targetSdkVersion 33
+        targetSdkVersion 34
+        compileSdk 34
        multiDexEnabled true
        // from gradle.properties
@@ -33,11 +22,6 @@ android {
        manifestPlaceholders = [HOME_APP: "android.intent.category.DEFAULT"]
    }
-    dexOptions {
-        preDexLibraries = true
-        jumboMode = true
-        javaMaxHeapSize "2g"
-    }
    signingConfigs {
        release {
            storeFile file(keystore)
@@ -76,11 +60,14 @@ android {
    packagingOptions {
        exclude 'values/attrs.xml'
        exclude 'values/dimens.xml'
+        jniLibs {
+            useLegacyPackaging = true
+        }
    }
    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_11
    }
    flavorDimensions "default" // OK

--- a/ABVJE_Res_Default_Android/build.gradle
+++ b/ABVJE_Res_Default_Android/build.gradle
@@ -6,11 +6,11 @@ buildscript {
 apply plugin: 'com.android.library'
 android {
-    compileSdkVersion 33
    defaultConfig {
        minSdkVersion 23
-        targetSdkVersion 33
+        targetSdkVersion 34
+        compileSdk 34
        //abvEnvironments
        resValue("string", "acms_address", "${acms_address}")
        resValue("string", "download_server_address", "${download_server_address}")

--- a/ABVJE_Res_Default_Android/res/values-ko/strings.xml
+++ b/ABVJE_Res_Default_Android/res/values-ko/strings.xml
@@ -46,7 +46,6 @@
    <string name="open">열기</string>
    <string name="close">닫기</string>
    <string name="change_password_ok">패스워드를 변경했습니다.</string>
-    <string name="content_text">자료본문</string>
    <string name="logout">로그아웃</string>
    <string name="logout_summary">어플리케이션에서 로그아웃합니다.</string>
    <string name="setting">설정</string>

--- a/ABVJE_Res_Default_Android/res/values/strings.xml
+++ b/ABVJE_Res_Default_Android/res/values/strings.xml
@@ -1555,4 +1555,11 @@
    <string name="failed_to_send_agreement">Failed to send information about agreeing to the Terms of Service to the server. Please tap \"Agree\" again.</string>
    <string name="msg_error_not_allowed_creating_process">You do not have the right to register for work.</string>
+    <string name="label_operation_report_type_routineTask">RoutineTask</string>
+    <string name="label_operation_report_type_routineTask_1"> RoutineTask(1)</string>
+    <string name="label_operation_report_type_routineTask_2"> RoutineTask(2)</string>
+    <string name="label_operation_report_type_routineTask_3"> RoutineTask(3)</string>
+    <string name="label_operation_report_type_routineTask_4"> RoutineTask(4)</string>
+    <string name="label_operation_report_type_routineTask_5"> RoutineTask(5)</string>
 </resources>
--- a/ABVJE_UI_Android/build.gradle
+++ b/ABVJE_UI_Android/build.gradle
@@ -25,11 +25,10 @@ dependencies {
 }
 android {
-    compileSdkVersion 33
  defaultConfig {
    minSdkVersion 23
-    targetSdkVersion 33
+    targetSdkVersion 34
+    compileSdk 34
    multiDexEnabled true
  }
  sourceSets {

--- a/ABVJE_UI_Android/res/layout/custom_preference_category.xml
+++ b/ABVJE_UI_Android/res/layout/custom_preference_category.xml
@@ -4,7 +4,7 @@
    android:layout_height="wrap_content"
    android:orientation="vertical" >
    <TextView
-        android:id="@+android:id/title"
+        android:id="@+id/title"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:gravity="center_vertical"

--- a/ABVJE_UI_Android/res/layout/custom_preference_checkbox.xml
+++ b/ABVJE_UI_Android/res/layout/custom_preference_checkbox.xml
@@ -8,7 +8,7 @@
    android:paddingRight="?android:attr/scrollbarSize">
    <CheckBox xmlns:android="http://schemas.android.com/apk/res/android"
-        android:id="@+android:id/checkbox"
+        android:id="@+id/checkbox"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:button="@drawable/selector_custom_checkbox"

--- a/ABVJE_UI_Android/res/layout/custom_preference_screen.xml
+++ b/ABVJE_UI_Android/res/layout/custom_preference_screen.xml
@@ -17,7 +17,7 @@
        android:layout_weight="1" >
        <TextView
-            android:id="@+android:id/title"
+            android:id="@+id/title"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:ellipsize="marquee"
@@ -27,7 +27,7 @@
            android:textAppearance="?android:attr/textAppearanceLarge"/>
        <TextView
-            android:id="@+android:id/summary"
+            android:id="@+id/summary"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:layout_alignLeft="@android:id/title"
@@ -38,7 +38,7 @@
    </RelativeLayout>
    <LinearLayout
-        android:id="@+android:id/widget_frame"
+        android:id="@+id/widget_frame"
        android:layout_width="wrap_content"
        android:layout_height="match_parent"
        android:minWidth="80dip"

--- a/build.gradle
+++ b/build.gradle
@@ -6,9 +6,9 @@ buildscript {
    google()
  }
  dependencies {
-    classpath 'com.android.tools.build:gradle:3.6.4'
+    classpath "com.android.tools.build:gradle:7.4.2"
-    // NOTE: Do not place your application dependencies here; they belong
+    classpath 'com.google.gms:google-services:4.3.8'
-    // in the individual module build.gradle files
+    classpath 'org.ajoberstar:gradle-git:0.12+'
  }
 }

--- a/gradle.properties
+++ b/gradle.properties
@@ -29,8 +29,6 @@ keyalias=ABook4AndroidReleaseKey
 keystorepassword=+ag2ntEc1?
 keyaliaspassword=micrOSoft_!sa1ko
-android.useDeprecatedNdk=true
 # Launcher AndroidManifest.xml
 app_custompackagename=jp.co.agentec.abookplus.check
 app_versioncode=1

--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip