Skip to content

Commit aa35df9

Browse files
shubham7109shubham7109
authored
Update feature branch with v.next (#243)
1 parent 54302bd commit aa35df9

File tree

23 files changed

+403
-382
lines changed

23 files changed

+403
-382
lines changed

‎README.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,10 @@ The *ArcGIS Maps SDK for Kotlin Toolkit* has a *Minimum SDK* version of *26*, me
2525
The *ArcGIS Maps SDK for Kotlin Toolkit* is released with a "bill of materials" (`BOM`). The releasable BOM is versioned and represents a set of versions of the toolkit components which are compatible with one another. You may specify dependencies as follows
2626

2727
```
28-
implementation(platform('com.esri:arcgis-maps-kotlin-toolkit-bom:200.2.0'))
28+
implementation(platform('com.esri:arcgis-maps-kotlin-toolkit-bom:200.3.0'))
2929
implementation('com.esri:arcgis-maps-kotlin-toolkit-authentication')
3030
implementation('com.esri:arcgis-maps-kotlin-toolkit-compass')
31+
implementation('com.esri:arcgis-maps-kotlin-toolkit-indoors')
3132
```
3233

3334
The template and TemplateApp modules are for bootstrapping new modules.

‎gradle.properties

+3-3
Original file line numberDiff line numberDiff line change
@@ -46,14 +46,14 @@ artifactoryUsername=""
4646
artifactoryPassword=""
4747
# these numbers will define the artifact version on artifactory
4848
# and are overridden by the jenkins command line in the daily build
49-
versionNumber=200.3.0
49+
versionNumber=200.4.0
5050
buildNumber=0000-snapshot
5151
#set this flag to `true` to ignore the build number when publishing. This
5252
# will publish an artifact with a build number like "..:200.2.0" as opposed to "...:200.2.0-3963
5353
ignoreBuildNumber=false
5454
# these versions define the dependency of the ArcGIS Maps SDK for Kotlin dependency
5555
# and are generally not overridden at the command line unless a special build is requested.
56-
sdkVersionNumber=200.3.0
57-
sdkBuildNumber=4038
56+
sdkVersionNumber=200.4.0
57+
sdkBuildNumber=4085
5858

5959

‎gradle/libs.versions.toml

+21-27
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,36 @@
11
[versions]
2-
androidGradlePlugin = "8.1.1"
3-
androidxActivity = "1.5.1"
4-
androidXBrowser = "1.5.0"
2+
androidGradlePlugin = "8.2.0"
3+
androidXBrowser = "1.7.0"
54
composeBOM = "2023.10.01"
6-
androidxComposeCompiler = "1.4.6"
7-
androidxCore = "1.9.0"
8-
androidxCoreTesting = "2.1.0"
9-
androidxEspresso = "3.4.0"
10-
androidxLifecycle = "2.3.1"
11-
androidxLifecycleRuntimeCompose = "2.6.0-beta01"
12-
androidxTestExt = "1.1.2"
13-
androidxViewmodelCompose = "2.6.1"
5+
androidxComposeCompiler = "1.5.6"
6+
androidxCore = "1.12.0"
7+
androidxEspresso = "3.5.1"
8+
androidxLifecycle = "2.6.2"
9+
androidxTestExt = "1.1.5"
1410
compileSdk = "34"
15-
compose-material3 = "1.1.0"
1611
junit = "4.13.2"
17-
kotlin = "1.8.20"
12+
kotlin = "1.9.21"
1813
minSdk = "26"
19-
kotlinxCoroutinesTest = "1.6.3"
20-
kotlinxSerializationJson = "1.5.0"
14+
kotlinxCoroutinesTest = "1.7.3"
15+
kotlinxSerializationJson = "1.5.1"
2116
truth = "1.1.4"
2217

2318
[libraries]
24-
android-gradlePlugin = { group = "com.android.tools.build", name = "gradle", version.ref = "androidGradlePlugin" }
25-
androidx-activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "androidxActivity" }
19+
androidx-activity-compose = { group = "androidx.activity", name = "activity-compose"}
2620
androidx-browser = { group = "androidx.browser", name = "browser", version.ref = "androidXBrowser"}
2721
androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "androidxCore" }
2822
androidx-compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "composeBOM" }
29-
androidx-compose-ui = { group = "androidx.compose.ui", name = "ui" }
30-
androidx-compose-runtime = { group = "androidx.compose.runtime", name = "runtime" }
31-
androidx-compose-material3 = { group = "androidx.compose.material3", name = "material3" }
32-
androidx-compose-ui-graphics = { group = "androidx.compose.ui", name = "ui-graphics" }
33-
androidx-compose-ui-test = { group = "androidx.compose.ui", name = "ui-test-junit4" }
34-
androidx-compose-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling" }
35-
androidx-compose-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview" }
36-
androidx-compose-ui-test-manifest = { group = "androidx.compose.ui", name = "ui-test-manifest" }
23+
androidx-compose-ui = { group = "androidx.compose.ui", name = "ui"}
24+
androidx-compose-runtime = { group = "androidx.compose.runtime", name = "runtime"}
25+
androidx-compose-material3 = { module = "androidx.compose.material3:material3"}
26+
androidx-compose-ui-graphics = { group = "androidx.compose.ui", name = "ui-graphics"}
27+
androidx-compose-ui-test = { group = "androidx.compose.ui", name = "ui-test-junit4"}
28+
androidx-compose-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling"}
29+
androidx-compose-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview"}
30+
androidx-compose-ui-test-manifest = { group = "androidx.compose.ui", name = "ui-test-manifest"}
3731
androidx-lifecycle-runtime-ktx = { group = "androidx.lifecycle", name = "lifecycle-runtime-ktx", version.ref = "androidxLifecycle" }
38-
androidx-lifecycle-viewmodel-compose = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-compose", version.ref = "androidxViewmodelCompose" }
39-
androidx-lifecycle-runtime-compose = { group = "androidx.lifecycle", name = "lifecycle-runtime-compose", version.ref = "androidxLifecycleRuntimeCompose"}
32+
androidx-lifecycle-viewmodel-compose = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-compose"}
33+
androidx-lifecycle-runtime-compose = { group = "androidx.lifecycle", name = "lifecycle-runtime-compose"}
4034
androidx-test-ext = { group = "androidx.test.ext", name = "junit-ktx", version.ref = "androidxTestExt" }
4135
androidx-test-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "androidxEspresso" }
4236
junit = { group = "junit", name = "junit", version.ref = "junit" }

‎gradle/wrapper/gradle-wrapper.jar

4.07 KB
Binary file not shown.

‎gradle/wrapper/gradle-wrapper.properties

+3-20
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,7 @@
1-
#
2-
#
3-
# Copyright 2023 Esri
4-
#
5-
# Licensed under the Apache License, Version 2.0 (the "License");
6-
# you may not use this file except in compliance with the License.
7-
# You may obtain a copy of the License at
8-
#
9-
# http://www.apache.org/licenses/LICENSE-2.0
10-
#
11-
# Unless required by applicable law or agreed to in writing, software
12-
# distributed under the License is distributed on an "AS IS" BASIS,
13-
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14-
# See the License for the specific language governing permissions and
15-
# limitations under the License.
16-
#
17-
#
18-
19-
#Thu May 04 21:42:41 PDT 2023
201
distributionBase=GRADLE_USER_HOME
212
distributionPath=wrapper/dists
22-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
4+
networkTimeout=10000
5+
validateDistributionUrl=true
236
zipStoreBase=GRADLE_USER_HOME
247
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)