Compare commits

...

5 Commits

Author SHA1 Message Date
rybakoff888ilia@gmail.com 03afdcbe20 Merge branch 'refs/heads/develop/mir-stash' into feature/MIR-6740-nexus 2024-07-09 18:11:39 +03:00
rybakoff888ilia@gmail.com 78b0715f51 change repos to nspk 2024-05-13 18:23:22 +03:00
Bogdan Terehov 8218d32f88 Merge pull request 'fix add namespace to yandex-map and base-map' (#13) from feature/update_gradle into feature/MIR-6740
Reviewed-on: #13
Reviewed-by: Vladimir Skorobogatov <vladimir.skorobogatov@noreply.localhost>
2024-05-02 13:02:27 +03:00
Bogdan Terehov 14f2d637aa fix add namespace to yandex-map and base-map 2024-05-01 18:38:51 +03:00
Bogdan Terehov 985a5658f0 feature MIR-6740: [Android] Добавление поддержки Android 14
migrate to gradle 8.0
2023-12-27 23:28:36 +03:00
12 changed files with 44 additions and 16 deletions

View File

@ -1,10 +1,10 @@
apply plugin: 'kotlin-android'
rootProject.ext {
compileSdk = 30
compileSdk = 34
minSdk = 21
targetSdk = 30
targetSdk = 34
}
android {
@ -16,12 +16,12 @@ android {
}
compileOptions {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}
kotlinOptions {
jvmTarget = JavaVersion.VERSION_1_8.toString()
jvmTarget = JavaVersion.VERSION_17.toString()
}
buildFeatures {

View File

@ -1 +1,5 @@
apply from: "../android-configs/lib-config.gradle"
android {
namespace = "ru.touchin.basemap"
}

View File

@ -1 +1 @@
<manifest package="ru.touchin.basemap"/>
<manifest />

View File

@ -1,8 +1,8 @@
buildscript {
repositories {
google()
jcenter()
maven { url "https://plugins.gradle.org/m2/" }
maven {
url = uri("https://nexus.mir/repository/maven-proxy-group/")
}
}
dependencies {
classpath 'com.android.tools.build:gradle:4.0.0'
@ -14,10 +14,8 @@ buildscript {
allprojects {
repositories {
google()
jcenter()
maven {
url "https://maven.dev.touchin.ru/"
url = uri("https://nexus.mir/repository/maven-proxy-group/")
metadataSources {
artifact()
}

View File

@ -1,5 +1,9 @@
apply from: "../android-configs/lib-config.gradle"
android {
namespace = "ru.touchin.extensions"
}
dependencies {
implementation "androidx.recyclerview:recyclerview"
implementation "androidx.fragment:fragment-ktx"

View File

@ -1,5 +1,9 @@
apply from: "../android-configs/lib-config.gradle"
android {
namespace = "ru.touchin.roboswag.core.log"
}
dependencies {
implementation "androidx.annotation:annotation"

View File

@ -1,6 +1,10 @@
apply from: "../android-configs/lib-config.gradle"
apply plugin: 'kotlin-android'
android {
namespace = "ru.touchin.roboswag.recyclerview_decorators"
}
dependencies {
implementation project(":utils")
implementation project(":kotlin-extensions")
@ -28,5 +32,7 @@ dependencies {
}
repositories {
mavenCentral()
maven {
url = uri("https://nexus.mir/repository/maven-proxy-group/")
}
}

View File

@ -1,5 +1,9 @@
apply from: "../android-configs/lib-config.gradle"
android {
namespace = "ru.touchin.roboswag.core.utils"
}
dependencies {
def coreVersion = '1.0.0'
def annotationVersion = '1.1.0'

View File

@ -35,5 +35,7 @@ dependencies {
}
repositories {
mavenCentral()
maven {
url = uri("https://nexus.mir/repository/maven-proxy-group/")
}
}

View File

@ -46,5 +46,7 @@ dependencies {
}
repositories {
mavenCentral()
maven {
url = uri("https://nexus.mir/repository/maven-proxy-group/")
}
}

View File

@ -13,3 +13,7 @@ dependencies {
}
}
}
android {
namespace = "ru.touchin.yandexmap"
}

View File

@ -1 +1 @@
<manifest package="ru.touchin.yandexmap"/>
<manifest />