From 393002839a9a2feb7fd7c6872477aba2d2ee9bca Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 14 May 2024 07:14:11 +0000 Subject: [PATCH] fix: Fat AAR --- build.gradle | 2 ++ mobile-sdk/build.gradle | 22 ++++++++++++++++------ 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/build.gradle b/build.gradle index 2b340f5..2df263b 100644 --- a/build.gradle +++ b/build.gradle @@ -5,11 +5,13 @@ buildscript { repositories { google() mavenCentral() + maven { url "https://plugins.gradle.org/m2/" } } dependencies { classpath 'com.android.tools.build:gradle:7.4.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath("org.jetbrains.dokka:dokka-gradle-plugin:${dokka_version}") + classpath 'com.github.kezong:fat-aar:1.3.8' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files } diff --git a/mobile-sdk/build.gradle b/mobile-sdk/build.gradle index 34f0a2d..e9fd822 100644 --- a/mobile-sdk/build.gradle +++ b/mobile-sdk/build.gradle @@ -8,6 +8,7 @@ plugins { id "org.jetbrains.dokka" id 'maven-publish' id "signing" + id "com.kezong.fat-aar" } def signingKey = findProperty('signingKey') @@ -32,8 +33,8 @@ android { defaultConfig { minSdkVersion 21 targetSdkVersion 34 - versionCode 48 - versionName "1.0.50" + versionCode 52 + versionName "1.0.54" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles "consumer-rules.pro" @@ -59,16 +60,25 @@ dependencies { dokkaHtmlPlugin("org.jetbrains.dokka:kotlin-as-java-plugin:1.6.20") //noinspection GradleDependency implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.9', optional - implementation 'com.google.code.gson:gson:2.9.0' - implementation 'org.greenrobot:eventbus:3.3.1' - - api 'com.orhanobut:logger:2.2.0' + embed('com.google.code.gson:gson:2.9.0') { + exclude(group:'androidx.annotation', module:'annotation') + } + embed('org.greenrobot:eventbus:3.3.1') { + exclude(group:'androidx.annotation', module:'annotation') + } + embed('com.orhanobut:logger:2.2.0') { + exclude(group:'androidx.annotation', module:'annotation') + } testImplementation 'junit:junit:4.13.2' androidTestImplementation 'org.assertj:assertj-core:3.21.0' androidTestImplementation 'androidx.test.ext:junit:1.1.3' } +fataar { + transitive = true +} + dokkaHtml.configure { dokkaSourceSets { named("main") {