Merge pull request #59 from what3words/staging

1.1.1

Author: mani-apps

.circleci/config.yml

@@ -12,7 +12,7 @@ jobs:
     steps:
       - checkout
       - restore_cache:
-          key: jars2-{{ checksum "build.gradle" }}-{{ checksum  "lib/build.gradle" }}
+          key: jars2-{{ checksum "build.gradle.kts" }}-{{ checksum  "lib/build.gradle.kts" }}
       - run:
           name: Chmod permissions #if permission for Gradlew Dependencies fail, use this.
           command: sudo chmod +x ./gradlew
@@ -25,7 +25,7 @@ jobs:
       - save_cache:
           paths:
             - ~/.gradle
-          key: jars2-{{ checksum "build.gradle" }}-{{ checksum  "lib/build.gradle" }}
+          key: jars2-{{ checksum "build.gradle.kts" }}-{{ checksum  "lib/build.gradle.kts" }}
       - android/create-avd:
           avd-name: testDevice
           system-image: system-images;android-30;google_apis;x86
@@ -35,21 +35,21 @@ jobs:
           no-window: true
           restore-gradle-cache-prefix: v2a
       - android/run-tests:
-          test-command: ./gradlew lib:jacocoTestReport
+          test-command: ./gradlew lib:connectedDebugAndroidTest
           max-tries: 3
       - android/save-gradle-cache:
           cache-prefix: v2a
       - store_test_results:
           path: lib/build/outputs/androidTest-results
   deploy-to-sonatype:
-    docker:
-      - image: cimg/android:2023.05-browsers
-    environment:
-      JVM_OPTS: -Xmx3200m
+    executor:
+      name: android/android-machine
+      resource-class: large
+      tag: 2023.05.1
     steps:
       - checkout
       - restore_cache:
-          key: jars-{{ checksum "build.gradle" }}-{{ checksum  "lib/build.gradle" }}
+          key: jars-{{ checksum "build.gradle.kts" }}-{{ checksum  "lib/build.gradle.kts" }}
       - run:
           name: Chmod permissions #if permission for Gradlew Dependencies fail, use this.
           command: sudo chmod +x ./gradlew
@@ -62,7 +62,7 @@ jobs:
       - save_cache:
           paths:
             - ~/.gradle
-          key: jars-{{ checksum "build.gradle" }}-{{ checksum  "lib/build.gradle" }}
+          key: jars-{{ checksum "build.gradle.kts" }}-{{ checksum  "lib/build.gradle.kts" }}
       - run:
           name: Force break line gradle properties
           command: echo -e '\n' >> gradle.properties
@@ -72,6 +72,10 @@ jobs:
             echo $GPG_SIGNING_KEY \
             | awk 'NR == 1 { print "SIGNING_KEY=" } 1' ORS='\\n' \
             >> gradle.properties
+      - run:
+          name: Snapshot Release Check
+          command: |
+            echo -e "\nIS_SNAPSHOT_RELEASE=$( [[ "${CIRCLE_BRANCH}" =~ ^epic.* ]] && echo true || echo false )" >> gradle.properties
       - run:
           name: Publish to Maven
           command: ./gradlew assemble publish
@@ -91,4 +95,6 @@ workflows:
             - mobile
           filters:
             branches:
-              only: /^(beta)\/.*/
+              only:
+                - /^(epic)\/.*/
+                - staging

build.gradle

@@ -0,0 +1,12 @@
+buildscript {
+    dependencies {
+        classpath("org.jacoco:org.jacoco.core:0.8.9")
+        classpath("com.android.tools.build:gradle:8.5.0")
+    }
+}
+plugins {
+    id("com.android.library") version "8.5.0" apply false
+    id("org.jetbrains.kotlin.android") version "1.8.20" apply false
+    id("org.jetbrains.kotlin.plugin.parcelize") version "1.8.20" apply false
+    id("com.autonomousapps.dependency-analysis") version "1.20.0"
+}

build.gradle.kts

@@ -21,5 +21,5 @@ kotlin.code.style=official
 # resources declared in the library itself and none from the library's dependencies,
 # thereby reducing the size of the R class for that library
 android.nonTransitiveRClass=true
-android.defaults.buildfeatures.buildconfig=true
 android.nonFinalResIds=false
+LIBRARY_VERSION = 1.1.1

gradle.properties

@@ -1,6 +1,6 @@
 #Tue Feb 14 12:46:52 GMT 2023
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME