Skip to content

Commit 4f04c01

Browse files
authored
Merge pull request #44 from what3words/staging
1.0.6
2 parents f6e5b9a + 5ad22d5 commit 4f04c01

35 files changed

+8
-747
lines changed

.circleci/config.yml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,8 @@ jobs:
3939
max-tries: 3
4040
- android/save-gradle-cache:
4141
cache-prefix: v2a
42-
- run:
43-
name: Assemble sample release build
44-
command: ./gradlew samples:assembleRelease
4542
- store_test_results:
4643
path: lib/build/outputs/androidTest-results
47-
- store_artifacts:
48-
path: samples/build/outputs/apk/release
4944
deploy-to-sonatype:
5045
docker:
5146
- image: cimg/android:2023.05-browsers
@@ -97,4 +92,4 @@ workflows:
9792
filters:
9893
branches:
9994
only:
100-
- dev
95+
- staging

.signing/release.jks

-2.35 KB
Binary file not shown.

build.gradle

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ buildscript {
22
ext {
33
mlkit_core_version = "19.0.0"
44
mlkit_languages_version = "16.0.0"
5-
what3words_android_wrapper_version = "3.1.24"
5+
what3words_android_wrapper_version = "3.1.26"
66
what3words_android_bridge_version = "1.0.3"
77
what3words_android_design_version = "1.0.3"
88
compose_version = "1.4.3"
@@ -11,15 +11,11 @@ buildscript {
1111
androidx_camera_version = "1.2.3"
1212
accompanist_version = '0.31.5-beta'
1313
coroutines_version = '1.7.3'
14-
espresso_version = "3.5.1"
1514
mockk_android_version = '1.13.3'
1615
junit_version = "1.1.5"
1716
orchestrator_version = "1.4.2"
1817
test_runner_version = "1.5.2"
1918
gms_version = "18.2.0"
20-
androidx_core_ktx_version = "1.10.1"
21-
androidx_appcompat_version = "1.6.1"
22-
material_version= "1.9.0"
2319
coverageExclusions = ['**/BR.*',
2420
'**/R.class',
2521
'**/R$*.class',
@@ -28,10 +24,11 @@ buildscript {
2824
'**/*Test*.*',
2925
'android/**/*.*',
3026
'androidx/**/*.*',]
27+
agp_version = '8.1.3'
3128
}
3229
}// Top-level build file where you can add configuration options common to all sub-projects/modules.
3330
plugins {
34-
id 'com.android.application' version '8.1.0' apply false
31+
id "com.android.application" version "$agp_version" apply false
3532
id 'com.android.library' version '8.1.0' apply false
3633
id 'org.jetbrains.kotlin.android' version '1.8.20' apply false
3734
id "org.jetbrains.kotlin.plugin.parcelize" version '1.8.20' apply false

lib/maven-push.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ def ossrhUsername = findProperty('OSSRH_USERNAME')
22
def ossrhPassword = findProperty('OSSRH_PASSWORD')
33
def signingKey = findProperty('SIGNING_KEY')
44
def signingKeyPwd = findProperty('SIGNING_KEY_PWD')
5-
def libVersion = findProperty('LIBRARY_VERSION') ? findProperty('LIBRARY_VERSION') : "1.0.5"
5+
def libVersion = "1.0.6"
66

77
afterEvaluate {
88
publishing {

lib/src/main/java/com/what3words/ocr/components/ui/OcrScanComposable.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,11 @@ import androidx.compose.ui.layout.onGloballyPositioned
4444
import androidx.compose.ui.platform.LocalConfiguration
4545
import androidx.compose.ui.platform.LocalContext
4646
import androidx.compose.ui.platform.LocalLifecycleOwner
47+
import androidx.compose.ui.platform.testTag
4748
import androidx.compose.ui.res.painterResource
4849
import androidx.compose.ui.res.stringResource
4950
import androidx.compose.ui.res.vectorResource
5051
import androidx.compose.ui.text.TextStyle
51-
import androidx.compose.ui.text.toLowerCase
5252
import androidx.compose.ui.tooling.preview.Preview
5353
import androidx.compose.ui.unit.Dp
5454
import androidx.compose.ui.unit.dp
@@ -354,7 +354,7 @@ fun W3WOcrScanner(
354354
onSuggestionSelected.invoke(
355355
SuggestionWithCoordinates(
356356
it,
357-
res.coordinates
357+
res
358358
)
359359
)
360360
} else {
@@ -470,7 +470,7 @@ private fun SuggestionPicker(
470470
) {
471471
val item = scanResultState.foundItems[it]
472472
SuggestionWhat3words(
473-
modifier = Modifier.animateItemPlacement(),
473+
modifier = Modifier.testTag("itemOCR ${item.words}").animateItemPlacement(),
474474
words = item.words,
475475
nearestPlace = item.nearestPlace,
476476
distance = item.distanceToFocusKm,

samples/.gitignore

Lines changed: 0 additions & 1 deletion
This file was deleted.

samples/build.gradle

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

samples/proguard-rules.pro

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

samples/release/output-metadata.json

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

samples/src/main/AndroidManifest.xml

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

0 commit comments

Comments
 (0)