3.1.4 (#53)

.circleci/config.yml

@@ -103,7 +103,7 @@ jobs:
             >> gradle.properties
       - run:
           name: Publish to Maven
-          command: ./gradlew assemble publish
+          command: ./gradlew lib:assemble publish
 workflows:
   build-test-sonar-publish:
     jobs:

README.md

@@ -8,15 +8,15 @@ To obtain an API key, please visit [https://what3words.com/select-plan](https://
 
 ## Installation
 
-The artifact is available through [![Maven Central](https://img.shields.io/maven-central/v/com.what3words/w3w-android-components.svg?label=Maven%20Central)](https://search.maven.org/search?q=g:%22com.what3words%22%20AND%20a:%22w3w-android-components%22)
+The artifact is available through [![Maven Central](https://img.shields.io/maven-central/v/com.what3words/w3w-android-components)](https://central.sonatype.com/artifact/com.what3words/w3w-android-components)
 
 ### Android minumum SDK support
 [![Generic badge](https://img.shields.io/badge/minSdk-23-green.svg)](https://developer.android.com/about/versions/marshmallow/android-6.0/)
 
 ### Gradle
 
 ```
-implementation 'com.what3words:w3w-android-components:3.1.3'
+implementation 'com.what3words:w3w-android-components:3.1.4'
 ```
 
 ## Documentation

advanced-sample/build.gradle

@@ -3,7 +3,6 @@ apply plugin: 'kotlin-android'
 
 android {
     compileSdkVersion 33
-    buildToolsVersion libs.versions.buildToolsVersion.get()
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
@@ -55,17 +54,13 @@ android {
 
 dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
-    implementation libs.jetbrains.kotlin.stdlib
-    implementation libs.androidx.core
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+    implementation "androidx.core:core-ktx:$androidx_core_ktx_version"
+    implementation "androidx.appcompat:appcompat:$androidx_appcompat_version"
+    implementation "androidx.constraintlayout:constraintlayout:$constraint_layout_version"
+    implementation "com.google.android.gms:play-services-maps:$google_player_services_version"
+    implementation "com.google.android.gms:play-services-location:$google_player_services_version"
 
-    implementation libs.androidx.appcompat
-    implementation libs.androidx.constraint.layout
-    implementation libs.google.play.services.maps
-    implementation libs.google.play.services.location
-    testImplementation testLibs.junit
-    androidTestImplementation testLibs.androidx.junit
-    androidTestImplementation testLibs.androidx.espresso.core
-
-    implementation libs.what3words.android.wrapper
+    implementation "com.what3words:w3w-android-wrapper:$what3words_android_wrapper_version"
     implementation project(":lib")
 }

build.gradle

@@ -1,11 +1,45 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.6.10'
-    ext.play_services = '17.0.0'
-    ext.compose_version = '1.2.1'
-    ext.kotlinx_coroutines_version = '1.3.0'
-    ext.dokkaVersion = '0.9.17'
+    ext {
+        kotlin_version = "1.8.10"
+        play_services = "17.0.0"
+        compose_version = "1.2.1"
+        kotlinx_coroutines_version = "1.5.2"
+        kotlinx_coroutines_android_version = "1.6.4"
+        dokka_version = "1.5.0"
+        recyclerview_version = "1.3.0"
+        junit_version = "4.13.2"
+        google_truth_version = "1.1.3"
+        androidx_core_ktx_version = "1.8.0"
+        androidx_test_version = "1.5.0"
+        androidx_junit_version = "1.1.5"
+        androidx_test_runner_version = "1.5.2"
+        androidx_arch_core_testing_version = "2.2.0"
+        androidx_appcompat_version = "1.6.1"
+        androidx_lifecycle_runtime_ktx_version = "2.3.1"
+        androidx_test_orchestrator_version = "1.4.1"
+        espresso_version = "3.4.0"
+        mockk_version = "1.12.1"
+        json_version = "20230618"
+        what3words_android_wrapper_version = "3.1.23"
+        guava_version = "27.0.1-android"
+        constraint_layout_version = "2.1.4"
+        lottie_version = "5.2.0"
+        compose_version = "1.2.1"
+        compose_compiler_version = "1.4.2"
+        compose_constraint_layout_version = "1.0.1"
+        compose_view_binding_version = "1.2.1"
+        androidx_activity_compose_version = "1.3.1"
+        google_material_version = "1.9.0"
+        google_player_services_version = "18.0.0"
+        android_gradle_plugin_version = "7.2.2"
+        klint_version = "10.1.0"
+        sonarqube_version = "3.3"
+        dependency_analysis_version = "1.20.0"
+        jacoco_version = "0.8.7"
+    }
+
     repositories {
         mavenCentral()
         google()
@@ -16,17 +50,16 @@ buildscript {
     }
 
     dependencies {
-        classpath "org.jacoco:org.jacoco.core:0.8.7"
-        classpath files(libs.class.superclass.protectionDomain.codeSource.location)
-        classpath files(testLibs.class.superclass.protectionDomain.codeSource.location)
+        classpath "org.jacoco:org.jacoco.core:$jacoco_version"
     }
 }
 
 plugins {
-    alias(libs.plugins.android.application) apply false
-    alias(libs.plugins.kotlin.android) apply false
-    alias(libs.plugins.klint) apply true // apply across all projects
-    alias(libs.plugins.sonarqube) apply true // apply across all projects
+    id "org.jetbrains.kotlin.android" version "$kotlin_version" apply false
+    id "com.android.application" version "$android_gradle_plugin_version" apply false
+    id "org.jlleitschuh.gradle.ktlint" version "$klint_version" apply true
+    id "org.sonarqube" version "$sonarqube_version" apply true
+    id "com.autonomousapps.dependency-analysis" version "$dependency_analysis_version" apply true
 }
 
 apply from: 'sonarqube.gradle'

compose-sample/build.gradle

@@ -39,7 +39,7 @@ android {
         viewBinding true
     }
     composeOptions {
-        kotlinCompilerExtensionVersion '1.3.0'
+        kotlinCompilerExtensionVersion "$compose_compiler_version"
     }
     packagingOptions {
         resources {
@@ -49,20 +49,19 @@ android {
 }
 
 dependencies {
-
     implementation project(":lib")
-    implementation libs.androidx.core
-
-    implementation libs.bundles.compose.application
-
-    testImplementation testLibs.junit
-    androidTestImplementation testLibs.androidx.espresso.core
-
-    androidTestImplementation testLibs.androidx.junit
-    androidTestImplementation testLibs.androidx.compose.ui.junit
+    implementation "androidx.core:core-ktx:$androidx_core_ktx_version"
+
+    // compose
+    implementation "androidx.compose.ui:ui:$compose_version"
+    implementation "androidx.compose.material:material:$compose_version"
+    implementation "androidx.compose.ui:ui-tooling-preview:$compose_version"
+    implementation "androidx.activity:activity-compose:$androidx_activity_compose_version"
+    implementation "androidx.lifecycle:lifecycle-runtime-ktx:$androidx_lifecycle_runtime_ktx_version"
+    implementation "androidx.constraintlayout:constraintlayout-compose:$compose_constraint_layout_version"
+    implementation "androidx.compose.ui:ui-viewbinding:$compose_view_binding_version"
+    implementation "com.google.android.material:material:$google_material_version"
 
-    debugImplementation libs.compose.ui.tooling
-    debugImplementation libs.compose.ui.test.manifest
-    implementation libs.compose.view.binding
-    implementation libs.google.android.material
+    debugImplementation "androidx.compose.ui:ui-tooling:$compose_version"
+    debugImplementation "androidx.compose.ui:ui-test-manifest:$compose_version"
 }

lib/build.gradle

@@ -3,7 +3,7 @@ plugins {
     id 'kotlin-android'
     id 'maven-publish'
     id 'signing'
-    id 'org.jetbrains.dokka' version '1.5.0'
+    id 'org.jetbrains.dokka' version "$dokka_version"
 }
 
 def libVersion = findProperty('LIBRARY_VERSION') ? findProperty('LIBRARY_VERSION') : "1.0-debug"
@@ -13,7 +13,6 @@ apply from: '../jacoco.gradle'
 
 android {
     compileSdkVersion 33
-    buildToolsVersion libs.versions.buildToolsVersion.get()
 
     kotlinOptions {
         jvmTarget = "1.8"
@@ -56,37 +55,39 @@ android {
         suppressInheritedMembers.set(true)
     }
     composeOptions {
-        kotlinCompilerExtensionVersion "1.3.1"
+        kotlinCompilerExtensionVersion "$compose_compiler_version"
     }
 }
 
 dependencies {
-    api libs.androidx.recyclerview
-    implementation libs.androidx.core
+    api "androidx.recyclerview:recyclerview:$recyclerview_version"
+    implementation "androidx.core:core-ktx:$androidx_core_ktx_version"
 
     // kotlin
-    implementation libs.jetbrains.kotlinx.coroutines.core
-    implementation libs.jetbrains.kotlinx.coroutines.android
-    testImplementation libs.jetbrains.kotlinx.coroutines.test
-
-    testImplementation testLibs.junit
-    testImplementation testLibs.androidx.test.core
-    testImplementation testLibs.google.truth
-    androidTestImplementation testLibs.androidx.junit
-    androidTestImplementation testLibs.androidx.espresso.core
-    testImplementation testLibs.mockk
-    testImplementation libs.json
-    testImplementation testLibs.androidx.arch.core
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlinx_coroutines_version"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$kotlinx_coroutines_version"
+
 
     // what3words wrapper
-    api libs.what3words.android.wrapper
-    implementation libs.androidx.appcompat
-    implementation libs.google.guava
-    implementation libs.androidx.constraint.layout
-    implementation libs.airbnb.lottie
+    api "com.what3words:w3w-android-wrapper:$what3words_android_wrapper_version"
+    implementation "androidx.appcompat:appcompat:$androidx_appcompat_version"
+    implementation "com.google.guava:guava:$guava_version"
+    implementation "androidx.constraintlayout:constraintlayout:$constraint_layout_version"
+    implementation "com.airbnb.android:lottie:$lottie_version"
 
     // compose
-    implementation libs.compose.foundation
-    compileOnly libs.compose.constraint.layout
-    compileOnly libs.compose.ui
+    implementation "androidx.compose.foundation:foundation:$compose_version"
+    compileOnly "androidx.constraintlayout:constraintlayout-compose:$compose_constraint_layout_version"
+    compileOnly "androidx.compose.ui:ui:$compose_version"
+
+    // testing
+    testImplementation "junit:junit:$junit_version"
+    testImplementation "androidx.test:core:$androidx_test_version"
+    testImplementation "com.google.truth:truth:$google_truth_version"
+    testImplementation "io.mockk:mockk:$mockk_version"
+    testImplementation  "org.json:json:$json_version"
+    testImplementation "androidx.arch.core:core-testing:$androidx_arch_core_testing_version"
+    testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:$kotlinx_coroutines_version"
+    androidTestImplementation "androidx.test.ext:junit:$androidx_junit_version"
+    androidTestImplementation "androidx.test.espresso:espresso-core:$espresso_version"
 }