From 0954c8de6e73763e832dace56ed56c500da1dac5 Mon Sep 17 00:00:00 2001 From: aliveoutside <53598473+aliveoutside@users.noreply.github.com> Date: Wed, 15 Mar 2023 13:17:31 +0300 Subject: [PATCH] move exportDex task under deps --- app/build.gradle | 76 ++++++++++++++++++++++++------------------------ 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 5af3e2ddf..4271a3ae8 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -30,6 +30,44 @@ task cleanVersionFile { projectDir.toPath().resolve("src/main/assets/version.properties").toFile().delete() } +android { + compileSdkVersion 32 + buildToolsVersion '32.0.0' + + sourceSets { + main { + java.srcDirs += 'build/generated/aidl_source_output_dir/release/out' + } + } + + defaultConfig { + applicationId "ru.vtosters.lite.utils.lite" + minSdk 22 + targetSdkVersion 32 + versionCode 1 + versionName "1.0" + multiDexEnabled true + } + + compileOptions { + coreLibraryDesugaringEnabled true + sourceCompatibility JavaVersion.VERSION_14 + targetCompatibility JavaVersion.VERSION_14 + } + namespace 'ru.vtosters.lite' + ndkVersion '25.2.9519653' +} + +dependencies { + implementation "com.microsoft.appcenter:appcenter-analytics:5.0.0" + implementation "com.microsoft.appcenter:appcenter-crashes:5.0.0" + coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5' + implementation 'net.sourceforge.streamsupport:streamsupport-minifuture:1.7.4' + implementation fileTree(dir: 'libs', include: ['*.aar']) + compileOnly fileTree(dir: 'libs', include: ['*.jar']) + implementation 'com.google.guava:guava:23.3-android' +} + task exportDex { doLast { try { @@ -85,44 +123,6 @@ task exportDex { } } -android { - compileSdkVersion 32 - buildToolsVersion '32.0.0' - - sourceSets { - main { - java.srcDirs += 'build/generated/aidl_source_output_dir/release/out' - } - } - - defaultConfig { - applicationId "ru.vtosters.lite.utils.lite" - minSdk 22 - targetSdkVersion 32 - versionCode 1 - versionName "1.0" - multiDexEnabled true - } - - compileOptions { - coreLibraryDesugaringEnabled true - sourceCompatibility JavaVersion.VERSION_14 - targetCompatibility JavaVersion.VERSION_14 - } - namespace 'ru.vtosters.lite' - ndkVersion '25.2.9519653' -} - -dependencies { - implementation "com.microsoft.appcenter:appcenter-analytics:5.0.0" - implementation "com.microsoft.appcenter:appcenter-crashes:5.0.0" - coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5' - implementation 'net.sourceforge.streamsupport:streamsupport-minifuture:1.7.4' - implementation fileTree(dir: 'libs', include: ['*.aar']) - compileOnly fileTree(dir: 'libs', include: ['*.jar']) - implementation 'com.google.guava:guava:23.3-android' -} - task prepareDexForMerge(type: Copy) { dependsOn('exportDex') // Remove comment for native lib build