Merge pull request #78 from Rallista/feat/ramani-local

Added ramani submodule

.github/workflows/android.yml

@@ -13,6 +13,9 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
+      with:
+        submodules: true
+
     - name: set up JDK 17
       uses: actions/setup-java@v4
       with:

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "android/ramani-maps"]
+	path = android/ramani-maps
+	url = https://github.com/Rallista/ramani-maps.git

android/MapLibreUI/build.gradle

@@ -32,7 +32,7 @@ android {
         compose true
     }
     composeOptions {
-        kotlinCompilerExtensionVersion '1.3.2'
+        kotlinCompilerExtensionVersion '1.5.8'
     }
     publishing {
         singleVariant('release') {
@@ -56,7 +56,7 @@ dependencies {
 
     implementation 'androidx.lifecycle:lifecycle-viewmodel-compose:2.7.0'
 
-    implementation 'org.ramani-maps:ramani-maplibre:0.2.0'
+    implementation project(':ramani-maplibre')
 
     implementation project(':core')
     implementation project(':compose-ui')

android/build.gradle

@@ -2,7 +2,7 @@
 plugins {
     id 'com.android.application' version '8.3.1' apply false
     id 'com.android.library' version '8.3.1' apply false
-    id 'org.jetbrains.kotlin.android' version '1.7.20' apply false
+    id 'org.jetbrains.kotlin.android' version '1.9.22' apply false
     id 'com.github.willir.rust.cargo-ndk-android' version '0.3.4' apply false
     id 'com.ncorti.ktfmt.gradle' version '0.17.0' apply false
     id 'maven-publish'

android/compose-ui/build.gradle

@@ -32,7 +32,7 @@ android {
         compose true
     }
     composeOptions {
-        kotlinCompilerExtensionVersion '1.3.2'
+        kotlinCompilerExtensionVersion '1.5.8'
     }
     publishing {
         singleVariant('release') {
@@ -47,7 +47,7 @@ dependencies {
     implementation platform('org.jetbrains.kotlin:kotlin-bom:1.8.0')
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.activity:activity-compose:1.8.2'
-    implementation platform('androidx.compose:compose-bom:2024.02.00')
+    implementation platform('androidx.compose:compose-bom:2024.03.00')
     implementation 'androidx.compose.ui:ui'
     implementation 'androidx.compose.ui:ui-graphics'
     implementation 'androidx.compose.ui:ui-tooling-preview'
@@ -59,7 +59,7 @@ dependencies {
 
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
-    androidTestImplementation platform('androidx.compose:compose-bom:2024.02.00')
+    androidTestImplementation platform('androidx.compose:compose-bom:2024.03.00')
 
     debugImplementation 'androidx.compose.ui:ui-tooling'
     debugImplementation 'androidx.compose.ui:ui-test-manifest'

android/demo-app/build.gradle

@@ -38,7 +38,7 @@ android {
         compose true
     }
     composeOptions {
-        kotlinCompilerExtensionVersion '1.3.2'
+        kotlinCompilerExtensionVersion '1.5.8'
     }
     packagingOptions {
         resources {

android/settings.gradle

@@ -6,7 +6,9 @@ pluginManagement {
     }
 }
 dependencyResolutionManagement {
-    repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
+    // TODO: Revert this to FAIL_ON_PROJECT_REPOS once ramani is installed from maven.
+//    repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
+    repositoriesMode.set(RepositoriesMode.PREFER_SETTINGS)
     repositories {
         google()
         mavenCentral()
@@ -17,3 +19,7 @@ include ':core'
 include ':compose-ui'
 include ':demo-app'
 include ':MapLibreUI'
+
+// TODO: Remove this once ramani is installed from maven.
+include ':ramani-maplibre'
+project(':ramani-maplibre').projectDir = new File('ramani-maps/ramani-maplibre')