Skip to content

Commit

Permalink
Merge pull request #287 from volga-volga/feat/javaToKotlin
Browse files Browse the repository at this point in the history
Upgrade SDK to 4.6.1. Rewrite with kotlin
  • Loading branch information
ownikss authored Jun 27, 2024
2 parents 825bbfd + f023d68 commit 5f8840c
Show file tree
Hide file tree
Showing 56 changed files with 3,513 additions and 3,563 deletions.
2 changes: 1 addition & 1 deletion RNYamap.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@ Pod::Spec.new do |s|
# s.requires_arc = true

s.dependency "React"
s.dependency "YandexMapsMobile", "4.2.2-full"
s.dependency "YandexMapsMobile", "4.6.1-full"
end
14 changes: 9 additions & 5 deletions android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,23 @@ buildscript {
}

apply plugin: 'com.android.library'
apply plugin: 'org.jetbrains.kotlin.android'

android {
compileSdkVersion 32
buildToolsVersion "33.0.2"

defaultConfig {
minSdkVersion 21
targetSdkVersion 32
compileSdkVersion 34
minSdkVersion 23
targetSdkVersion 34
versionCode 1
versionName "1.1"
}
lintOptions {
abortOnError false
}
kotlinOptions {
jvmTarget = '17'
}
}

repositories {
Expand All @@ -30,5 +33,6 @@ repositories {
dependencies {
implementation 'com.google.android.gms:play-services-location:+'
implementation 'com.facebook.react:react-native:+'
implementation 'com.yandex.android:maps.mobile:4.5.1-full'
implementation 'com.yandex.android:maps.mobile:4.6.1-full'
implementation 'androidx.core:core-ktx:1.13.1'
}
351 changes: 0 additions & 351 deletions android/src/main/java/ru/vvdev/yamap/ClusteredYamapViewManager.java

This file was deleted.

Loading

0 comments on commit 5f8840c

Please sign in to comment.