fix: fix android aar issue (#32)

amplitude · May 12, 2022 · 69f5fe7 · 69f5fe7
1 parent a2c5968
commit 69f5fe7
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 5 deletions.
diff --git a/android/build.gradle b/android/build.gradle
@@ -1,6 +1,7 @@
 plugins {
     id 'com.android.library'
     id 'kotlin-android'
+    id 'com.kezong.fat-aar'
 }
 
 ext {
@@ -51,10 +52,12 @@ android {
 }
 
 dependencies {
-    api project(':common')
-    api project(':common-android')
-    api project(':id')
-    api project(':core')
+    embed project(':common')
+    embed project(':common-jvm')
+    embed project(':common-android')
+    embed project(':core')
+    embed project(':event-bridge')
+    embed project(':id')
     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2'
     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.2'
 

diff --git a/build.gradle b/build.gradle
@@ -14,6 +14,7 @@ buildscript {
         classpath "org.jlleitschuh.gradle:ktlint-gradle:10.2.1"
         classpath "io.github.gradle-nexus:publish-plugin:1.1.0"
         classpath "de.mannodermaus.gradle.plugins:android-junit5:1.8.2.0"
+        classpath 'com.github.kezong:fat-aar:1.3.8'
     }
 }
 
@@ -34,6 +35,8 @@ allprojects{
 
     apply plugin: "org.jlleitschuh.gradle.ktlint"
     apply plugin: 'org.jetbrains.dokka'
+
+    group GROUP
 }
 
 tasks.dokkaHtmlMultiModule.configure {

diff --git a/common-jvm/build.gradle b/common-jvm/build.gradle
@@ -14,6 +14,7 @@ test {
 
 dependencies {
     api project(":common")
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
     testImplementation platform("org.junit:junit-bom:5.7.2")
     testImplementation "org.junit.jupiter:junit-jupiter"
 }
diff --git a/common/build.gradle b/common/build.gradle
@@ -6,4 +6,8 @@ plugins {
 java {
     sourceCompatibility = JavaVersion.VERSION_1_8
     targetCompatibility = JavaVersion.VERSION_1_8
-}
+}
+
+dependencies {
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+}
diff --git a/event-bridge/build.gradle b/event-bridge/build.gradle
@@ -11,6 +11,7 @@ test {
     useJUnitPlatform()
 }
 dependencies {
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
     testImplementation platform("org.junit:junit-bom:5.7.2")
     testImplementation "org.junit.jupiter:junit-jupiter"
 }
diff --git a/gradle.properties b/gradle.properties
@@ -18,3 +18,4 @@ POM_DEVELOPER_ORG=Amplitude
 POM_DEVELOPER_ORG_URL=https://amplitude.com/
 RELEASE_REPOSITORY_URL=https://oss.sonatype.org/service/local/staging/deploy/maven2/
 SNAPSHOT_REPOSITORY_URL=https://oss.sonatype.org/content/repositories/snapshots/
+GROUP=com.amplitude
diff --git a/id/build.gradle b/id/build.gradle
@@ -13,6 +13,7 @@ test {
 }
 
 dependencies {
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
     testImplementation platform("org.junit:junit-bom:5.7.2")
     testImplementation "org.junit.jupiter:junit-jupiter"
 }
diff --git a/samples/java-android-app/build.gradle b/samples/java-android-app/build.gradle
@@ -36,6 +36,7 @@ android {
 }
 
 dependencies {
+    implementation project(':core')
     implementation project(':android')
     implementation 'androidx.core:core-ktx:1.7.0'
     implementation 'androidx.appcompat:appcompat:1.4.1'

diff --git a/samples/kotlin-android-app/build.gradle b/samples/kotlin-android-app/build.gradle
@@ -39,6 +39,7 @@ android {
 }
 
 dependencies {
+    implementation project(':core')
     implementation project(':android')
     implementation 'androidx.core:core-ktx:1.7.0'
     implementation 'androidx.appcompat:appcompat:1.4.1'