Skip to content

A
abook_check
Commit 1730a742 by Kim Jinsung
Options

#60274【Android_APIlevel34】@Form

parent ebb3ca66
Showing with 11 additions and 19 deletions
ABVJE_Launcher_Android/build.gradle
...@@ -4,7 +4,6 @@ buildscript { ...@@ -4,7 +4,6 @@ buildscript {
} }
dependencies { dependencies {
classpath 'org.ajoberstar:gradle-git:0.12+' classpath 'org.ajoberstar:gradle-git:0.12+'
classpath 'com.google.gms:google-services:4.0.1'
} }
} }
...@@ -17,11 +16,10 @@ dependencies { ...@@ -17,11 +16,10 @@ dependencies {
} }
android { android {
compileSdkVersion 33
defaultConfig { defaultConfig {
minSdkVersion 23 minSdkVersion 23
targetSdkVersion 33 targetSdkVersion 34
compileSdk 34
multiDexEnabled true multiDexEnabled true
// from gradle.properties // from gradle.properties
...@@ -33,11 +31,6 @@ android { ...@@ -33,11 +31,6 @@ android {
manifestPlaceholders = [HOME_APP: "android.intent.category.DEFAULT"] manifestPlaceholders = [HOME_APP: "android.intent.category.DEFAULT"]
} }
dexOptions {
preDexLibraries = true
jumboMode = true
javaMaxHeapSize "2g"
}
signingConfigs { signingConfigs {
release { release {
storeFile file(keystore) storeFile file(keystore)
...@@ -79,8 +72,8 @@ android { ...@@ -79,8 +72,8 @@ android {
} }
compileOptions { compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8 sourceCompatibility JavaVersion.VERSION_11
targetCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_11
} }
flavorDimensions "default" // OK flavorDimensions "default" // OK
......
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 33
defaultConfig { defaultConfig {
minSdkVersion 23 minSdkVersion 23
targetSdkVersion 33 targetSdkVersion 34
compileSdk 34
//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}")
......
ABVJE_UI_Android/build.gradle
...@@ -26,11 +26,11 @@ dependencies { ...@@ -26,11 +26,11 @@ dependencies {
} }
android { android {
compileSdkVersion 33
defaultConfig { defaultConfig {
minSdkVersion 23 minSdkVersion 23
targetSdkVersion 33 targetSdkVersion 34
compileSdk 34
multiDexEnabled true multiDexEnabled true
} }
sourceSets { sourceSets {
......
build.gradle
...@@ -6,9 +6,8 @@ buildscript { ...@@ -6,9 +6,8 @@ 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 classpath 'com.google.gms:google-services:4.3.8'
// in the individual module build.gradle files
} }
} }
......
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-8.5-bin.zip
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