diff --git a/android/app/build.gradle b/android/app/build.gradle index 8ee533d65..c19f03c7c 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -15,12 +15,6 @@ buildscript { } } -repositories { - google() - mavenCentral() - maven { url 'https://www.jitpack.io' } // MPAndroidChart -} - apply plugin: 'com.android.application' apply plugin: 'com.github.triplet.play' apply plugin: 'ru.cian.huawei-publish-gradle-plugin' @@ -412,6 +406,8 @@ android { } dependencies { + implementation project(':sdk') + coreLibraryDesugaring libs.android.tools.desugar // Google Play Location Services diff --git a/android/sdk/build.gradle b/android/sdk/build.gradle new file mode 100644 index 000000000..f32bb7953 --- /dev/null +++ b/android/sdk/build.gradle @@ -0,0 +1,28 @@ +plugins { + id 'com.android.library' +} + +android { + namespace 'app.organicmaps.sdk' + compileSdk propCompileSdkVersion.toInteger() + + defaultConfig { + minSdk propMinSdkVersion.toInteger() + targetSdk propTargetSdkVersion.toInteger() + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 + } +} + +dependencies { + +} diff --git a/android/app/src/main/assets/categories.txt b/android/sdk/src/main/assets/categories.txt similarity index 100% rename from android/app/src/main/assets/categories.txt rename to android/sdk/src/main/assets/categories.txt diff --git a/android/app/src/main/assets/categories_brands.txt b/android/sdk/src/main/assets/categories_brands.txt similarity index 100% rename from android/app/src/main/assets/categories_brands.txt rename to android/sdk/src/main/assets/categories_brands.txt diff --git a/android/app/src/main/assets/categories_cuisines.txt b/android/sdk/src/main/assets/categories_cuisines.txt similarity index 100% rename from android/app/src/main/assets/categories_cuisines.txt rename to android/sdk/src/main/assets/categories_cuisines.txt diff --git a/android/app/src/main/assets/classificator.txt b/android/sdk/src/main/assets/classificator.txt similarity index 100% rename from android/app/src/main/assets/classificator.txt rename to android/sdk/src/main/assets/classificator.txt diff --git a/android/app/src/main/assets/colors.txt b/android/sdk/src/main/assets/colors.txt similarity index 100% rename from android/app/src/main/assets/colors.txt rename to android/sdk/src/main/assets/colors.txt diff --git a/android/app/src/main/assets/countries-strings b/android/sdk/src/main/assets/countries-strings similarity index 100% rename from android/app/src/main/assets/countries-strings rename to android/sdk/src/main/assets/countries-strings diff --git a/android/app/src/main/assets/countries.txt b/android/sdk/src/main/assets/countries.txt similarity index 100% rename from android/app/src/main/assets/countries.txt rename to android/sdk/src/main/assets/countries.txt diff --git a/android/app/src/main/assets/drules_proto_default_dark.bin b/android/sdk/src/main/assets/drules_proto_default_dark.bin similarity index 100% rename from android/app/src/main/assets/drules_proto_default_dark.bin rename to android/sdk/src/main/assets/drules_proto_default_dark.bin diff --git a/android/app/src/main/assets/drules_proto_default_light.bin b/android/sdk/src/main/assets/drules_proto_default_light.bin similarity index 100% rename from android/app/src/main/assets/drules_proto_default_light.bin rename to android/sdk/src/main/assets/drules_proto_default_light.bin diff --git a/android/app/src/main/assets/drules_proto_outdoors_dark.bin b/android/sdk/src/main/assets/drules_proto_outdoors_dark.bin similarity index 100% rename from android/app/src/main/assets/drules_proto_outdoors_dark.bin rename to android/sdk/src/main/assets/drules_proto_outdoors_dark.bin diff --git a/android/app/src/main/assets/drules_proto_outdoors_light.bin b/android/sdk/src/main/assets/drules_proto_outdoors_light.bin similarity index 100% rename from android/app/src/main/assets/drules_proto_outdoors_light.bin rename to android/sdk/src/main/assets/drules_proto_outdoors_light.bin diff --git a/android/app/src/main/assets/drules_proto_vehicle_dark.bin b/android/sdk/src/main/assets/drules_proto_vehicle_dark.bin similarity index 100% rename from android/app/src/main/assets/drules_proto_vehicle_dark.bin rename to android/sdk/src/main/assets/drules_proto_vehicle_dark.bin diff --git a/android/app/src/main/assets/drules_proto_vehicle_light.bin b/android/sdk/src/main/assets/drules_proto_vehicle_light.bin similarity index 100% rename from android/app/src/main/assets/drules_proto_vehicle_light.bin rename to android/sdk/src/main/assets/drules_proto_vehicle_light.bin diff --git a/android/app/src/main/assets/editor.config b/android/sdk/src/main/assets/editor.config similarity index 100% rename from android/app/src/main/assets/editor.config rename to android/sdk/src/main/assets/editor.config diff --git a/android/app/src/main/assets/fonts b/android/sdk/src/main/assets/fonts similarity index 100% rename from android/app/src/main/assets/fonts rename to android/sdk/src/main/assets/fonts diff --git a/android/app/src/main/assets/icudt75l.dat b/android/sdk/src/main/assets/icudt75l.dat similarity index 100% rename from android/app/src/main/assets/icudt75l.dat rename to android/sdk/src/main/assets/icudt75l.dat diff --git a/android/app/src/main/assets/languages.txt b/android/sdk/src/main/assets/languages.txt similarity index 100% rename from android/app/src/main/assets/languages.txt rename to android/sdk/src/main/assets/languages.txt diff --git a/android/app/src/main/assets/packed_polygons.bin b/android/sdk/src/main/assets/packed_polygons.bin similarity index 100% rename from android/app/src/main/assets/packed_polygons.bin rename to android/sdk/src/main/assets/packed_polygons.bin diff --git a/android/app/src/main/assets/patterns.txt b/android/sdk/src/main/assets/patterns.txt similarity index 100% rename from android/app/src/main/assets/patterns.txt rename to android/sdk/src/main/assets/patterns.txt diff --git a/android/app/src/main/assets/resources-6plus_dark b/android/sdk/src/main/assets/resources-6plus_dark similarity index 100% rename from android/app/src/main/assets/resources-6plus_dark rename to android/sdk/src/main/assets/resources-6plus_dark diff --git a/android/app/src/main/assets/resources-6plus_light b/android/sdk/src/main/assets/resources-6plus_light similarity index 100% rename from android/app/src/main/assets/resources-6plus_light rename to android/sdk/src/main/assets/resources-6plus_light diff --git a/android/app/src/main/assets/resources-default b/android/sdk/src/main/assets/resources-default similarity index 100% rename from android/app/src/main/assets/resources-default rename to android/sdk/src/main/assets/resources-default diff --git a/android/app/src/main/assets/resources-hdpi_dark b/android/sdk/src/main/assets/resources-hdpi_dark similarity index 100% rename from android/app/src/main/assets/resources-hdpi_dark rename to android/sdk/src/main/assets/resources-hdpi_dark diff --git a/android/app/src/main/assets/resources-hdpi_light b/android/sdk/src/main/assets/resources-hdpi_light similarity index 100% rename from android/app/src/main/assets/resources-hdpi_light rename to android/sdk/src/main/assets/resources-hdpi_light diff --git a/android/app/src/main/assets/resources-mdpi_dark b/android/sdk/src/main/assets/resources-mdpi_dark similarity index 100% rename from android/app/src/main/assets/resources-mdpi_dark rename to android/sdk/src/main/assets/resources-mdpi_dark diff --git a/android/app/src/main/assets/resources-mdpi_light b/android/sdk/src/main/assets/resources-mdpi_light similarity index 100% rename from android/app/src/main/assets/resources-mdpi_light rename to android/sdk/src/main/assets/resources-mdpi_light diff --git a/android/app/src/main/assets/resources-xhdpi_dark b/android/sdk/src/main/assets/resources-xhdpi_dark similarity index 100% rename from android/app/src/main/assets/resources-xhdpi_dark rename to android/sdk/src/main/assets/resources-xhdpi_dark diff --git a/android/app/src/main/assets/resources-xhdpi_light b/android/sdk/src/main/assets/resources-xhdpi_light similarity index 100% rename from android/app/src/main/assets/resources-xhdpi_light rename to android/sdk/src/main/assets/resources-xhdpi_light diff --git a/android/app/src/main/assets/resources-xxhdpi_dark b/android/sdk/src/main/assets/resources-xxhdpi_dark similarity index 100% rename from android/app/src/main/assets/resources-xxhdpi_dark rename to android/sdk/src/main/assets/resources-xxhdpi_dark diff --git a/android/app/src/main/assets/resources-xxhdpi_light b/android/sdk/src/main/assets/resources-xxhdpi_light similarity index 100% rename from android/app/src/main/assets/resources-xxhdpi_light rename to android/sdk/src/main/assets/resources-xxhdpi_light diff --git a/android/app/src/main/assets/resources-xxxhdpi_dark b/android/sdk/src/main/assets/resources-xxxhdpi_dark similarity index 100% rename from android/app/src/main/assets/resources-xxxhdpi_dark rename to android/sdk/src/main/assets/resources-xxxhdpi_dark diff --git a/android/app/src/main/assets/resources-xxxhdpi_light b/android/sdk/src/main/assets/resources-xxxhdpi_light similarity index 100% rename from android/app/src/main/assets/resources-xxxhdpi_light rename to android/sdk/src/main/assets/resources-xxxhdpi_light diff --git a/android/app/src/main/assets/sound-strings b/android/sdk/src/main/assets/sound-strings similarity index 100% rename from android/app/src/main/assets/sound-strings rename to android/sdk/src/main/assets/sound-strings diff --git a/android/app/src/main/assets/transit_colors.txt b/android/sdk/src/main/assets/transit_colors.txt similarity index 100% rename from android/app/src/main/assets/transit_colors.txt rename to android/sdk/src/main/assets/transit_colors.txt diff --git a/android/app/src/main/assets/types.txt b/android/sdk/src/main/assets/types.txt similarity index 100% rename from android/app/src/main/assets/types.txt rename to android/sdk/src/main/assets/types.txt diff --git a/android/app/src/main/assets/vulkan_shaders b/android/sdk/src/main/assets/vulkan_shaders similarity index 100% rename from android/app/src/main/assets/vulkan_shaders rename to android/sdk/src/main/assets/vulkan_shaders diff --git a/android/settings.gradle b/android/settings.gradle index 4a7e6b740..35da8e37d 100644 --- a/android/settings.gradle +++ b/android/settings.gradle @@ -5,13 +5,14 @@ pluginManagement { gradlePluginPortal() } } -// See comment in buildscript block of app/build.gradle -//dependencyResolutionManagement { -// repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) -// repositories { -// google() -// mavenCentral() -// } -//} +dependencyResolutionManagement { + repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) + repositories { + google() + mavenCentral() + maven { url 'https://www.jitpack.io' } // MPAndroidChart + } +} rootProject.name = 'CoMaps' include ':app' +include ':sdk'