Skip to content

Commit 2e2a5c6

Browse files
committed
Merge remote-tracking branch 'origin/main' into migrate-ios-to-swift-package-manager
# Conflicts: # arcgis_map_sdk_ios/ios/arcgis_map_sdk_ios/Sources/arcgis_map_sdk_ios/ArcgisMapView.swift
2 parents f4ccd88 + 8109f31 commit 2e2a5c6

File tree

30 files changed

+713
-550
lines changed

30 files changed

+713
-550
lines changed

arcgis_map_sdk/README.md

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,6 @@ dependencies:
1818
```
1919
2020
21-
### Android only setup
22-
(Android) In `<app>/android/app/proguard-rules.pro` add:
23-
24-
```
25-
-keep class dev.fluttercommunity.arcgis_map_sdk_android.** { *; }
26-
```
27-
28-
2921
### Use ArcgisMap
3022
Integrate the `ArcgisMap` Widget
3123

@@ -108,7 +100,7 @@ Checkout the example app `example/lib/main.dart` for more details.
108100
| addViewPadding | ✅ | ✅ | ✅ |
109101
| toggleBaseMap | ✅ | ✅ | ✅ |
110102
| moveCamera | ✅ | ✅ | ✅ |
111-
| moveCameraToPoints | |||
103+
| moveCameraToPoints | | ✅ | ✅ |
112104
| use AutoPanMode | | ✅ | ✅ |
113105
| exportImage | | ✅ | ✅ |
114106
| zoomIn | ✅ | ✅ | ✅ |

arcgis_map_sdk/lib/src/arcgis_map_controller.dart

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,9 @@ class ArcgisMapController {
183183
);
184184
}
185185

186+
/// Moves the camera to the provided [points] and makes sure that all of
187+
/// them are visible.
188+
/// Currently, [padding] is only supported on mobile.
186189
Future<void> moveCameraToPoints({
187190
required List<LatLng> points,
188191
double? padding,

arcgis_map_sdk_android/android/build.gradle

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,17 @@ group 'dev.fluttercommunity.arcgis_map_sdk_android'
22
version '1.0-SNAPSHOT'
33

44
buildscript {
5-
ext.kotlin_version = '1.9.0'
5+
ext.kotlin_version = '2.1.20'
66
repositories {
77
google()
88
mavenCentral()
9+
maven {
10+
url 'https://esri.jfrog.io/artifactory/arcgis'
11+
}
912
}
1013

1114
dependencies {
12-
classpath 'com.android.tools.build:gradle:8.3.2'
15+
classpath 'com.android.tools.build:gradle:8.7.3'
1316
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1417
}
1518
}
@@ -55,14 +58,15 @@ android {
5558
}
5659

5760
defaultConfig {
58-
minSdkVersion 23
61+
minSdkVersion 26
62+
consumerProguardFiles 'proguard-rules.pro'
5963
}
6064
}
6165

6266
dependencies {
6367
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
6468

6569
implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
66-
implementation 'com.esri.arcgisruntime:arcgis-android:100.15.0'
67-
implementation 'com.google.code.gson:gson:2.8.8'
70+
implementation 'com.esri:arcgis-maps-kotlin:200.7.0'
71+
implementation 'com.google.code.gson:gson:2.13.1'
6872
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#Thu Oct 24 09:10:14 CEST 2024
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
55
zipStoreBase=GRADLE_USER_HOME
66
zipStorePath=wrapper/dists
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
-keep class dev.fluttercommunity.arcgis_map_sdk_android.model.** { *; }
2+
-keep class dev.fluttercommunity.arcgis_map_sdk_android.util.** { *; }

0 commit comments

Comments
 (0)