Use composite builds for gl-native and common (#2819)

Author: jush

.circleci/config.yml

@@ -128,7 +128,7 @@ commands:
   store-results:
     steps:
       - store_artifacts:
-          path: sdk/build
+          path: maps-sdk/build
       - store_artifacts:
           path: LICENSE.md
 
@@ -142,7 +142,7 @@ commands:
           name: Initialize developer access token for sdk tests
           command: |
             if [ -n "${MAPBOX_DEVELOPER_CONFIG_XML}" ]; then
-              echo "${MAPBOX_DEVELOPER_CONFIG_XML}" > sdk/src/androidTest/res/values/developer-config.xml
+              echo "${MAPBOX_DEVELOPER_CONFIG_XML}" > maps-sdk/src/androidTest/res/values/developer-config.xml
             fi
       - run:
           name: Build << parameters.module_target >> instrumentation test apk
@@ -385,7 +385,7 @@ jobs:
                 name: check release runtime Mapbox dependencies to fail fast
                 command: |
                   echo "PR Target branch: $PR_TARGET_BRANCH"
-                  ./gradlew sdk:dependencyInsight --configuration releaseRuntimeClasspath --dependency com.mapbox.maps | grep -vzq 'FAILED'
+                  ./gradlew maps-sdk:dependencyInsight --configuration releaseRuntimeClasspath --dependency com.mapbox.maps | grep -vzq 'FAILED'
             - run:
                 name: check changelog
                 command: |
@@ -620,7 +620,7 @@ jobs:
             - mapbox-gl-native-begin
             - login-google-cloud-platform
             - run-firebase-instrumentation:
-                module_target: "sdk"
+                module_target: "maps-sdk"
                 multiple_devices: false
             - mapbox-gl-native-end
       - run: exit 0
@@ -633,7 +633,7 @@ jobs:
       - read-from-workspace
       - login-google-cloud-platform
       - run-firebase-instrumentation:
-          module_target: "sdk"
+          module_target: "maps-sdk"
           multiple_devices: true
       - slack/notify:
           event: fail
@@ -737,13 +737,13 @@ jobs:
             - save-to-workspace:
                 path: "app/build/outputs/apk/androidTest/debug/app-debug-androidTest.apk"
             - build-instrumentation-test:
-                module_target: "sdk"
+                module_target: "maps-sdk"
             - save-to-workspace:
-                path: "sdk/build/outputs/apk/androidTest/debug/sdk-debug-androidTest.apk"
+                path: "maps-sdk/build/outputs/apk/androidTest/debug/maps-sdk-debug-androidTest.apk"
             - build-instrumentation-test:
                 module_target: "module-telemetry"
             - save-to-workspace:
-                path: "module-telemetry/build/outputs/apk/androidTest/debug/sdk-debug-androidTest.apk"
+                path: "module-telemetry/build/outputs/apk/androidTest/debug/module-telemetry-debug-androidTest.apk"
             - store_artifacts:
                 path: app/build/outputs/apk
                 destination: .

DEVELOPING.md

@@ -30,15 +30,15 @@ clean:
 
 .PHONY: codecoverage
 codecoverage:
-	./gradlew sdk:jacocoTestDebugUnitTestReport && google-chrome sdk/build/jacoco/jacocoHtml/index.html
+	./gradlew maps-sdk:jacocoTestDebugUnitTestReport && google-chrome maps-sdk/build/jacoco/jacocoHtml/index.html
 
 .PHONY: unit-tests
 unit-tests:
 	./gradlew test -i
 
 .PHONY: instrumentation-tests
 instrumentation-tests:
-	./gradlew sdk:connectedDebugAndroidTest && ./gradlew app:connectedDebugAndroidTest
+	./gradlew maps-sdk:connectedDebugAndroidTest && ./gradlew app:connectedDebugAndroidTest
 
 .PHONY: instrumentation-clean
 instrumentation-clean:

LICENSE.md

@@ -2,7 +2,6 @@ plugins {
   id("com.mapbox.gradle.application")
 }
 
-val buildFromSource: String by project
 
 android {
   compileSdk = libs.versions.autoCompileSdkVersion.get().toInt()
@@ -27,12 +26,6 @@ android {
       execution = "ANDROIDX_TEST_ORCHESTRATOR"
     }
   }
-
-  packagingOptions {
-    if (buildFromSource.toBoolean()) {
-      jniLibs.pickFirsts.add("**/libc++_shared.so")
-    }
-  }
 }
 
 dependencies {
@@ -41,7 +34,7 @@ dependencies {
 
   // Please review the compatibility guide. This app is showcasing the latest features with latest Maps SDK main branch.
   // https://github.com/mapbox/mapbox-maps-android/tree/main/extension-androidauto#compatibility-with-maps-sdk-v11
-  implementation(project(":sdk"))
+  implementation(project(":maps-sdk"))
 
   implementation(libs.kotlin)
   implementation(libs.androidx.appCompat)

Makefile

@@ -7,7 +7,6 @@ apply {
   from("$rootDir/gradle/script-git-version.gradle")
   from("$rootDir/gradle/play-publisher.gradle")
 }
-val buildFromSource: String by project
 
 android {
   compileSdk = libs.versions.exampleCompileSdkVersion.get().toInt()
@@ -84,16 +83,10 @@ android {
       path = file("src/main/cpp/CMakeLists.txt")
     }
   }
-
-  packagingOptions {
-    if (buildFromSource.toBoolean()) {
-      jniLibs.pickFirsts.add("**/libc++_shared.so")
-    }
-  }
 }
 
 dependencies {
-  implementation(project(":sdk"))
+  implementation(project(":maps-sdk"))
   implementation(libs.kotlin)
   implementation(libs.mapbox.javaTurf)
   implementation(libs.mapbox.javaGeoJSON)

android-auto-app/build.gradle.kts

@@ -3,7 +3,6 @@ plugins {
   id("org.jetbrains.kotlin.plugin.parcelize")
 }
 
-val buildFromSource: String by project
 
 android {
   compileSdk = libs.versions.androidCompileSdkVersion.get().toInt()
@@ -54,19 +53,13 @@ android {
     }
   }
 
-  packagingOptions {
-    if (buildFromSource.toBoolean()) {
-      jniLibs.pickFirsts.add("**/libc++_shared.so")
-    }
-  }
-
   buildFeatures {
     compose = true
   }
 }
 
 dependencies {
-  implementation(project(":sdk"))
+  implementation(project(":maps-sdk"))
   implementation(project(":extension-compose"))
   implementation(platform(libs.compose.bom))
   implementation(libs.compose.ui)

app/build.gradle.kts

@@ -34,7 +34,7 @@ mapboxLibrary {
 }
 
 dependencies {
-  api(project(":sdk"))
+  api(project(":maps-sdk"))
   api(libs.googleCarAppLibrary)
   implementation(libs.kotlin)
   implementation(libs.androidx.coreKtx)

compose-app/build.gradle.kts

@@ -50,7 +50,7 @@ mapboxLibrary {
 
 dependencies {
   dependencies {
-    compileOnly(project(":sdk"))
+    compileOnly(project(":maps-sdk"))
     implementation(platform(libs.compose.bom))
     implementation(libs.mapbox.javaGeoJSON)
     implementation(libs.compose.ui)
@@ -67,11 +67,11 @@ dependencies {
     androidTestImplementation(libs.androidx.testJUnit)
     androidTestImplementation(libs.androidx.espresso)
     androidTestImplementation(libs.androidx.uiAutomator)
-    androidTestImplementation(project(":sdk"))
+    androidTestImplementation(project(":maps-sdk"))
     androidTestImplementation(libs.compose.uiTest)
 
     testImplementation(libs.bundles.base.dependenciesTests)
-    testImplementation(project(":sdk"))
+    testImplementation(project(":maps-sdk"))
     testImplementation(libs.junit)
 
     detektPlugins(libs.detektFormatting)

extension-androidauto/build.gradle.kts

@@ -3,7 +3,6 @@ plugins {
   id("com.mapbox.maps.token")
 }
 
-val buildFromSource: String by project
 
 android {
   compileSdk = libs.versions.androidCompileSdkVersion.get().toInt()
@@ -29,15 +28,10 @@ android {
     }
   }
 
-  packagingOptions {
-    if (buildFromSource.toBoolean()) {
-      jniLibs.pickFirsts.add("**/libc++_shared.so")
-    }
-  }
 }
 
 dependencies {
-  implementation(project(":sdk"))
+  implementation(project(":maps-sdk"))
   implementation(libs.kotlin)
   implementation(libs.androidx.appCompat)
   androidTestUtil(libs.androidx.orchestrator)