Skip to content

A
abook_check
Commit 0793ce16 by Kazuyuki Hida
Options

Android Gradle Pluginのバージョンを7.4.2に上げた時の差分

parent 03a5b402
Showing with 50 additions and 47 deletions
ABVJE_BL/build.gradle
...@@ -7,7 +7,7 @@ version = '1.0' ...@@ -7,7 +7,7 @@ version = '1.0'
dependencies { dependencies {
testImplementation 'junit:junit:4.11' testImplementation 'junit:junit:4.11'
implementation 'commons-codec:commons-codec:1.10' implementation 'commons-codec:commons-codec:1.11'
implementation 'net.lingala.zip4j:zip4j:1.3.2' implementation 'net.lingala.zip4j:zip4j:1.3.2'
implementation files('libs/java_websocket_0.8.jar') implementation files('libs/java_websocket_0.8.jar')
} }
......
ABVJE_Launcher_Android/build.gradle
buildscript { buildscript {
repositories { repositories {
jcenter() google()
mavenCentral()
} }
dependencies { dependencies {
classpath 'org.ajoberstar:gradle-git:0.12+' classpath 'org.ajoberstar:gradle-git:0.12.0'
classpath 'com.google.gms:google-services:4.0.1' classpath 'com.google.gms:google-services:4.3.15'
} }
} }
...@@ -13,15 +14,15 @@ apply plugin: 'com.google.gms.google-services' ...@@ -13,15 +14,15 @@ apply plugin: 'com.google.gms.google-services'
dependencies { dependencies {
implementation project(':ABVJE_UI_Android') implementation project(':ABVJE_UI_Android')
implementation 'androidx.multidex:multidex:2.0.0' implementation 'androidx.multidex:multidex:2.0.1'
} }
android { android {
compileSdkVersion 31 compileSdkVersion 33
defaultConfig { defaultConfig {
minSdkVersion 23 minSdkVersion 23
targetSdkVersion 31 targetSdkVersion 33
multiDexEnabled true multiDexEnabled true
// from gradle.properties // from gradle.properties
...@@ -61,10 +62,10 @@ android { ...@@ -61,10 +62,10 @@ android {
assets.srcDirs = ['assets'] assets.srcDirs = ['assets']
} }
} }
lintOptions { packagingOptions {
quiet true resources {
checkReleaseBuilds false excludes += ['values/attrs.xml', 'values/dimens.xml']
abortOnError false }
} }
buildTypes { buildTypes {
...@@ -73,10 +74,6 @@ android { ...@@ -73,10 +74,6 @@ android {
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt' proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
} }
} }
packagingOptions {
exclude 'values/attrs.xml'
exclude 'values/dimens.xml'
}
compileOptions { compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8 sourceCompatibility JavaVersion.VERSION_1_8
...@@ -130,6 +127,11 @@ android { ...@@ -130,6 +127,11 @@ android {
} }
} }
} }
lint {
abortOnError false
checkReleaseBuilds false
quiet true
}
} }
import org.ajoberstar.grgit.* import org.ajoberstar.grgit.*
......
ABVJE_Res_Default_Android/build.gradle
...@@ -6,11 +6,11 @@ buildscript { ...@@ -6,11 +6,11 @@ buildscript {
apply plugin: 'com.android.library' apply plugin: 'com.android.library'
android { android {
compileSdkVersion 31 compileSdkVersion 33
defaultConfig { defaultConfig {
minSdkVersion 23 minSdkVersion 23
targetSdkVersion 31 targetSdkVersion 33
//abvEnvironments //abvEnvironments
resValue("string", "acms_address", "${acms_address}") resValue("string", "acms_address", "${acms_address}")
resValue("string", "download_server_address", "${download_server_address}") resValue("string", "download_server_address", "${download_server_address}")
...@@ -75,7 +75,7 @@ android { ...@@ -75,7 +75,7 @@ android {
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt' proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
} }
} }
lintOptions { lint {
abortOnError false abortOnError false
} }
} }
ABVJE_UI_Android/build.gradle
buildscript { buildscript {
repositories { repositories {
jcenter() google()
mavenCentral()
} }
} }
...@@ -8,17 +9,17 @@ apply plugin: 'com.android.library' ...@@ -8,17 +9,17 @@ apply plugin: 'com.android.library'
dependencies { dependencies {
implementation 'androidx.multidex:multidex:2.0.0' implementation 'androidx.multidex:multidex:2.0.1'
implementation project(':ABVJE_BL') implementation project(':ABVJE_BL')
implementation project(':ABVJE_Res_Default_Android') implementation project(':ABVJE_Res_Default_Android')
implementation files('libs/ozrv_android.jar') implementation files('libs/ozrv_android.jar')
api 'com.google.firebase:firebase-core:21.1.1' api 'com.google.firebase:firebase-core:21.1.1'
api 'com.google.firebase:firebase-messaging:23.0.8' api 'com.google.firebase:firebase-messaging:23.1.1'
api 'androidx.appcompat:appcompat:1.0.0' api 'androidx.appcompat:appcompat:1.6.1'
implementation 'commons-codec:commons-codec:1.10' implementation 'commons-codec:commons-codec:1.11'
implementation 'net.lingala.zip4j:zip4j:1.3.2' implementation 'net.lingala.zip4j:zip4j:1.3.2'
implementation 'com.google.guava:guava:18.0' // implementation 'com.google.guava:guava:18.0'
implementation 'com.google.zxing:core:3.2.1' implementation 'com.google.zxing:core:3.2.1'
implementation 'org.jsoup:jsoup:1.9.2' implementation 'org.jsoup:jsoup:1.9.2'
implementation project(':xwalk_core_library') implementation project(':xwalk_core_library')
...@@ -26,11 +27,11 @@ dependencies { ...@@ -26,11 +27,11 @@ dependencies {
} }
android { android {
compileSdkVersion 31 compileSdkVersion 33
defaultConfig { defaultConfig {
minSdkVersion 23 minSdkVersion 23
targetSdkVersion 31 targetSdkVersion 33
multiDexEnabled true multiDexEnabled true
} }
sourceSets { sourceSets {
...@@ -45,11 +46,6 @@ android { ...@@ -45,11 +46,6 @@ android {
jniLibs.srcDirs = ['libs', 'xwalk_core_library/src/main/jniLibs'] jniLibs.srcDirs = ['libs', 'xwalk_core_library/src/main/jniLibs']
} }
} }
lintOptions {
quiet true
checkReleaseBuilds false
abortOnError false
}
buildTypes { buildTypes {
release { release {
...@@ -59,6 +55,11 @@ android { ...@@ -59,6 +55,11 @@ android {
} }
useLibrary 'org.apache.http.legacy' useLibrary 'org.apache.http.legacy'
lint {
abortOnError false
checkReleaseBuilds false
quiet true
}
} }
gradle.projectsEvaluated { gradle.projectsEvaluated {
......
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/common/view/ABVCachedWebView.java
...@@ -96,10 +96,10 @@ public class ABVCachedWebView extends WebView { ...@@ -96,10 +96,10 @@ public class ABVCachedWebView extends WebView {
@SuppressLint("JavascriptInterface") @SuppressLint("JavascriptInterface")
public void initSetting() { public void initSetting() {
Logger.d(TAG, "[initSetting]"); Logger.d(TAG, "[initSetting]");
getSettings().setAppCacheEnabled(true); // getSettings().setAppCacheEnabled(true);
getSettings().setAllowFileAccess(true); getSettings().setAllowFileAccess(true);
getSettings().setAppCacheMaxSize(8 * 1024 * 1024); // getSettings().setAppCacheMaxSize(8 * 1024 * 1024);
//jacascriptを許可する //jacascriptを許可する
getSettings().setJavaScriptEnabled(true); getSettings().setJavaScriptEnabled(true);
addJavascriptInterface(new _JavascriptInterface(), "ABVCachedWebView"); addJavascriptInterface(new _JavascriptInterface(), "ABVCachedWebView");
......
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/OperationListActivity.java
...@@ -191,7 +191,7 @@ public class OperationListActivity extends ABVUIActivity { ...@@ -191,7 +191,7 @@ public class OperationListActivity extends ABVUIActivity {
} }
WebSettings settings = mCheckWebView.getSettings(); WebSettings settings = mCheckWebView.getSettings();
settings.setJavaScriptEnabled(true); //Javascriptを有効にする。 settings.setJavaScriptEnabled(true); //Javascriptを有効にする。
settings.setAppCacheEnabled(true); // settings.setAppCacheEnabled(true);
settings.setCacheMode(WebSettings.LOAD_DEFAULT); settings.setCacheMode(WebSettings.LOAD_DEFAULT);
settings.setMixedContentMode(WebSettings.MIXED_CONTENT_ALWAYS_ALLOW); settings.setMixedContentMode(WebSettings.MIXED_CONTENT_ALWAYS_ALLOW);
......
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/view/ChatWebView.java
...@@ -37,7 +37,7 @@ public class ChatWebView extends WebView { ...@@ -37,7 +37,7 @@ public class ChatWebView extends WebView {
addJavascriptInterface(this, "android"); addJavascriptInterface(this, "android");
WebSettings settings = getSettings(); WebSettings settings = getSettings();
settings.setJavaScriptEnabled(true); //Javascriptを有効にする。 settings.setJavaScriptEnabled(true); //Javascriptを有効にする。
settings.setAppCacheEnabled(true); // settings.setAppCacheEnabled(true);
settings.setCacheMode(WebSettings.LOAD_NO_CACHE); settings.setCacheMode(WebSettings.LOAD_NO_CACHE);
settings.setMixedContentMode(WebSettings.MIXED_CONTENT_ALWAYS_ALLOW); settings.setMixedContentMode(WebSettings.MIXED_CONTENT_ALWAYS_ALLOW);
......
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/viewer/activity/EnqueteWebViewActivity.java
...@@ -135,7 +135,7 @@ public class EnqueteWebViewActivity extends ABVContentViewActivity { ...@@ -135,7 +135,7 @@ public class EnqueteWebViewActivity extends ABVContentViewActivity {
//noinspection deprecation(API18から非推奨になった。無視) //noinspection deprecation(API18から非推奨になった。無視)
settings.setPluginState(PluginState.ON); // 「EventHub.removeMessages(int what = 107) is not supported before the WebViewCore is set up.」のエラー対応（あまり効果ない？） settings.setPluginState(PluginState.ON); // 「EventHub.removeMessages(int what = 107) is not supported before the WebViewCore is set up.」のエラー対応（あまり効果ない？）
settings.setDomStorageEnabled(true); // WebStorage有効化 settings.setDomStorageEnabled(true); // WebStorage有効化
settings.setAppCacheEnabled(false); // settings.setAppCacheEnabled(false);
settings.setCacheMode(WebSettings.LOAD_NO_CACHE); settings.setCacheMode(WebSettings.LOAD_NO_CACHE);
// webView.loadDataWithBaseURL("", url2, "text/html", "UTF-8", ""); // webView.loadDataWithBaseURL("", url2, "text/html", "UTF-8", "");
//ターゲットバージョン30以上からデフォルトがfalseに設定されている問題対応 //ターゲットバージョン30以上からデフォルトがfalseに設定されている問題対応
......
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/viewer/activity/HTMLWebViewActivity.java
...@@ -124,7 +124,7 @@ public class HTMLWebViewActivity extends ParentWebViewActivity { ...@@ -124,7 +124,7 @@ public class HTMLWebViewActivity extends ParentWebViewActivity {
//noinspection deprecation(API18から非推奨になった。無視) //noinspection deprecation(API18から非推奨になった。無視)
settings.setPluginState(PluginState.ON); // 「EventHub.removeMessages(int what = 107) is not supported before the WebViewCore is set up.」のエラー対応（あまり効果ない？） settings.setPluginState(PluginState.ON); // 「EventHub.removeMessages(int what = 107) is not supported before the WebViewCore is set up.」のエラー対応（あまり効果ない？）
settings.setDomStorageEnabled(true); // WebStorage有効化 settings.setDomStorageEnabled(true); // WebStorage有効化
settings.setAppCacheEnabled(false); // settings.setAppCacheEnabled(false);
settings.setCacheMode(WebSettings.LOAD_NO_CACHE); settings.setCacheMode(WebSettings.LOAD_NO_CACHE);
// webView.loadDataWithBaseURL("", url2, "text/html", "UTF-8", ""); // webView.loadDataWithBaseURL("", url2, "text/html", "UTF-8", "");
settings.setAllowFileAccessFromFileURLs(true); //Android7利用で警告ダイヤログ表示問題対応 settings.setAllowFileAccessFromFileURLs(true); //Android7利用で警告ダイヤログ表示問題対応
......
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/viewer/activity/OnlineHTMLWebViewActivity.java
...@@ -111,7 +111,7 @@ public class OnlineHTMLWebViewActivity extends ABVContentViewActivity { ...@@ -111,7 +111,7 @@ public class OnlineHTMLWebViewActivity extends ABVContentViewActivity {
settings.setUseWideViewPort(true); // 画面の横幅にページの横幅を合わせる settings.setUseWideViewPort(true); // 画面の横幅にページの横幅を合わせる
settings.setPluginState(WebSettings.PluginState.ON); // 「EventHub.removeMessages(int what = 107) is not supported before the WebViewCore is set up.」のエラー対応（あまり効果ない？） settings.setPluginState(WebSettings.PluginState.ON); // 「EventHub.removeMessages(int what = 107) is not supported before the WebViewCore is set up.」のエラー対応（あまり効果ない？）
settings.setDomStorageEnabled(true); // WebStorage有効化 settings.setDomStorageEnabled(true); // WebStorage有効化
settings.setAppCacheEnabled(false); // settings.setAppCacheEnabled(false);
settings.setCacheMode(WebSettings.LOAD_NO_CACHE); settings.setCacheMode(WebSettings.LOAD_NO_CACHE);
settings.setAllowFileAccessFromFileURLs(true); //Android7利用で警告ダイヤログ表示問題対応 settings.setAllowFileAccessFromFileURLs(true); //Android7利用で警告ダイヤログ表示問題対応
//ターゲットバージョン30以上からデフォルトがfalseに設定されている問題対応 //ターゲットバージョン30以上からデフォルトがfalseに設定されている問題対応
......
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/viewer/view/EnqueteLayout.java
...@@ -124,7 +124,7 @@ public class EnqueteLayout extends RelativeLayout { ...@@ -124,7 +124,7 @@ public class EnqueteLayout extends RelativeLayout {
//noinspection deprecation(API18から非推奨になった。無視) //noinspection deprecation(API18から非推奨になった。無視)
settings.setPluginState(WebSettings.PluginState.ON); // 「EventHub.removeMessages(int what = 107) is not supported before the WebViewCore is set up.」のエラー対応（あまり効果ない？） settings.setPluginState(WebSettings.PluginState.ON); // 「EventHub.removeMessages(int what = 107) is not supported before the WebViewCore is set up.」のエラー対応（あまり効果ない？）
settings.setDomStorageEnabled(true); // WebStorage有効化 settings.setDomStorageEnabled(true); // WebStorage有効化
settings.setAppCacheEnabled(false); // settings.setAppCacheEnabled(false);
settings.setCacheMode(WebSettings.LOAD_NO_CACHE); settings.setCacheMode(WebSettings.LOAD_NO_CACHE);
} }
//ターゲットバージョン30以上からデフォルトがfalseに設定されている問題対応 //ターゲットバージョン30以上からデフォルトがfalseに設定されている問題対応
......
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/viewer/view/OperationTaskLayout.java
...@@ -104,7 +104,7 @@ public class OperationTaskLayout extends RelativeLayout { ...@@ -104,7 +104,7 @@ public class OperationTaskLayout extends RelativeLayout {
//noinspection deprecation(API18から非推奨になった。無視) //noinspection deprecation(API18から非推奨になった。無視)
settings.setPluginState(WebSettings.PluginState.ON); // 「EventHub.removeMessages(int what = 107) is not supported before the WebViewCore is set up.」のエラー対応（あまり効果ない？） settings.setPluginState(WebSettings.PluginState.ON); // 「EventHub.removeMessages(int what = 107) is not supported before the WebViewCore is set up.」のエラー対応（あまり効果ない？）
settings.setDomStorageEnabled(true); // WebStorage有効化 settings.setDomStorageEnabled(true); // WebStorage有効化
settings.setAppCacheEnabled(false); // settings.setAppCacheEnabled(false);
settings.setCacheMode(WebSettings.LOAD_NO_CACHE); settings.setCacheMode(WebSettings.LOAD_NO_CACHE);
// mWebView.loadDataWithBaseURL("", url2, "text/html", "UTF-8", ""); // mWebView.loadDataWithBaseURL("", url2, "text/html", "UTF-8", "");
settings.setAllowFileAccessFromFileURLs(true); //Android7利用で警告ダイヤログ表示問題対応 settings.setAllowFileAccessFromFileURLs(true); //Android7利用で警告ダイヤログ表示問題対応
......
build.gradle
...@@ -6,7 +6,7 @@ buildscript { ...@@ -6,7 +6,7 @@ buildscript {
google() google()
} }
dependencies { 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 // NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files // in the individual module build.gradle files
} }
...@@ -14,7 +14,7 @@ buildscript { ...@@ -14,7 +14,7 @@ buildscript {
allprojects { allprojects {
repositories { repositories {
jcenter()
google() google()
mavenCentral()
} }
} }
gradle/wrapper/gradle-wrapper.properties
...@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME ...@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
xwalk_core_library/build.gradle
apply plugin: 'com.android.library' apply plugin: 'com.android.library'
android { android {
compileSdkVersion 31 compileSdkVersion 33
defaultConfig { defaultConfig {
minSdkVersion 23 minSdkVersion 23
targetSdkVersion 31 targetSdkVersion 33
} }
buildTypes { buildTypes {
...@@ -14,7 +14,8 @@ android { ...@@ -14,7 +14,8 @@ android {
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt' proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
} }
} }
lintOptions { namespace 'org.xwalk.core'
lint {
abortOnError false abortOnError false
} }
......
xwalk_core_library/src/main/AndroidManifest.xml
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.xwalk.core"
android:versionCode="1" android:versionCode="1"
android:versionName="1.0" > android:versionName="1.0" >
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment