Commit e16c3ae8 by Kim Jinsung

Merge branch 'features/1.2.302' into features/1.2.360

parents 3ff012b5 bc286274
......@@ -13,11 +13,11 @@ apply plugin: 'com.google.gms.google-services'
dependencies {
implementation project(':ABVJE_UI_Android')
implementation 'com.android.support:multidex:1.0.2'
implementation 'com.android.support:multidex:1.0.3'
}
android {
compileSdkVersion 28
compileSdkVersion 26
buildToolsVersion '28.0.3'
defaultConfig {
......
......@@ -6,12 +6,12 @@ buildscript {
apply plugin: 'com.android.library'
android {
compileSdkVersion 21
buildToolsVersion '27.0.3'
compileSdkVersion 26
buildToolsVersion '28.0.3'
defaultConfig {
minSdkVersion 16
targetSdkVersion 28
minSdkVersion 23
targetSdkVersion 29
//abvEnvironments
resValue("string", "acms_address", "${acms_address}")
resValue("string", "download_server_address", "${download_server_address}")
......
......@@ -8,6 +8,7 @@ apply plugin: 'com.android.library'
dependencies {
implementation 'com.android.support:multidex:1.0.3'
implementation project(':ABVJE_BL')
implementation project(':ABVJE_Res_Default_Android')
implementation files('libs/ozrv_android.jar')
......@@ -26,11 +27,11 @@ dependencies {
android {
compileSdkVersion 26
buildToolsVersion '27.0.3'
buildToolsVersion '28.0.3'
defaultConfig {
minSdkVersion 16
targetSdkVersion 28
minSdkVersion 23
targetSdkVersion 29
multiDexEnabled true
}
sourceSets {
......
......@@ -86,8 +86,8 @@ is_check_invalid_passward_limit=true
repeat_default=true
#Setting Info(設定画面のABookについての設定情報)
version_name=1.2.301
release_date=2020/08/31
version_name=1.2.302
release_date=2020/09/08
copy_right=2016 AGENTEC Co.,Ltd. All rights reserved.
hope_page=http://www.agentec.jp
contact_email=abook-appsupport@agentec.jp
......@@ -127,4 +127,9 @@ BLJAR_NAME=ABVJE_BL.jar
#store用の場合、armv7,x86両方ビルド
#storeではない場合、armv7のみビルド
isStoreProduct=false
\ No newline at end of file
isStoreProduct=false
#1.2.302 Edition
#CHECK = 5
#EXFRAME = 6
edition_type=5
\ No newline at end of file
apply plugin: 'com.android.library'
android {
compileSdkVersion 21
buildToolsVersion '27.0.3'
compileSdkVersion 26
buildToolsVersion '28.0.3'
defaultConfig {
minSdkVersion 16
targetSdkVersion 28
minSdkVersion 23
targetSdkVersion 29
}
buildTypes {
......
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