Skip to content

Commit 5f8840c

Browse files
authored
Merge pull request #287 from volga-volga/feat/javaToKotlin
Upgrade SDK to 4.6.1. Rewrite with kotlin
2 parents 825bbfd + f023d68 commit 5f8840c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+3513
-3563
lines changed

RNYamap.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@ Pod::Spec.new do |s|
1414
# s.requires_arc = true
1515

1616
s.dependency "React"
17-
s.dependency "YandexMapsMobile", "4.2.2-full"
17+
s.dependency "YandexMapsMobile", "4.6.1-full"
1818
end

android/build.gradle

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,23 @@ buildscript {
77
}
88

99
apply plugin: 'com.android.library'
10+
apply plugin: 'org.jetbrains.kotlin.android'
1011

1112
android {
12-
compileSdkVersion 32
13-
buildToolsVersion "33.0.2"
1413

1514
defaultConfig {
16-
minSdkVersion 21
17-
targetSdkVersion 32
15+
compileSdkVersion 34
16+
minSdkVersion 23
17+
targetSdkVersion 34
1818
versionCode 1
1919
versionName "1.1"
2020
}
2121
lintOptions {
2222
abortOnError false
2323
}
24+
kotlinOptions {
25+
jvmTarget = '17'
26+
}
2427
}
2528

2629
repositories {
@@ -30,5 +33,6 @@ repositories {
3033
dependencies {
3134
implementation 'com.google.android.gms:play-services-location:+'
3235
implementation 'com.facebook.react:react-native:+'
33-
implementation 'com.yandex.android:maps.mobile:4.5.1-full'
36+
implementation 'com.yandex.android:maps.mobile:4.6.1-full'
37+
implementation 'androidx.core:core-ktx:1.13.1'
3438
}

android/src/main/java/ru/vvdev/yamap/ClusteredYamapViewManager.java

Lines changed: 0 additions & 351 deletions
This file was deleted.

0 commit comments

Comments
 (0)