Release 1.6.1

• Adds support for Android 13 (API level 33)
• Migrates from Android Support Library to AndroidX

Author: wessmith

.github/workflows/ci.yml

@@ -1,6 +1,7 @@
 name: CI
 
 on:
+  workflow_dispatch:
   pull_request:
     types: [opened, synchronize, reopened]
   push:
@@ -15,7 +16,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-java@v1
         with:
-          java-version: 1.8
+          java-version: 17
       - uses: actions/cache@v2
         with:
           path: |
@@ -35,7 +36,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-java@v1
         with:
-          java-version: 1.8
+          java-version: 17
       - uses: actions/cache@v2
         with:
           path: |
@@ -64,7 +65,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-java@v1
         with:
-          java-version: 1.8
+          java-version: 17
       - uses: actions/cache@v2
         with:
           path: |

.gitignore

@@ -50,3 +50,6 @@ google-services.json
 freeline.py
 freeline/
 freeline_project_description.json
+
+# OS-specific metadata
+.DS_Store

build.gradle

@@ -26,23 +26,27 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.4.10'
+    ext.kotlin_version = '1.9.0'
 
     repositories {
         google()
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.2'
-        classpath 'org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.8.2'
-        classpath 'com.vanniktech:gradle-android-junit-jacoco-plugin:0.16.0'
+        classpath 'com.android.tools.build:gradle:8.0.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }
 }
 
+plugins {
+    id 'org.jetbrains.dokka' version '1.8.20'
+    id 'com.github.kt3k.coveralls' version '2.12.2'
+    id 'jacoco'
+}
+
 allprojects {
     repositories {
         maven {
@@ -77,9 +81,10 @@ subprojects {
 }
 
 ext {
-    supportLibVersion = '28.0.0'
+    annotationVersion = '1.6.0'
+    espressoVersion = '3.1.0'
     junitVersion = '4.13.1'
     mockitoVersion = '2.28.2'
-    espressoVersion = '3.0.2'
     testRunnerVersion = '1.0.2'
+    mockwebserverVersion = '4.4.0'
 }

button-merchant/build.gradle

@@ -25,20 +25,20 @@
 
 apply plugin: 'com.android.library'
 apply plugin: 'com.github.kt3k.coveralls'
-apply plugin: 'com.vanniktech.android.junit.jacoco'
+apply plugin: 'jacoco'
 
 apply from: "${rootProject.projectDir}/button-merchant/publish-maven-central.gradle"
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 33
 
     defaultConfig {
         minSdkVersion 15
-        targetSdkVersion 28
+        targetSdkVersion 33
         buildConfigField 'int', 'VERSION_CODE', "1"
         buildConfigField 'String', 'VERSION_NAME', "\"${version}\""
 
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
     buildTypes {
@@ -61,21 +61,23 @@ configurations {
 }
 
 dependencies {
-    implementation "com.android.support:support-annotations:$supportLibVersion"
+    implementation "androidx.annotation:annotation:$annotationVersion"
     compileOnly 'com.google.code.findbugs:jsr305:3.0.2'
+
     testImplementation "junit:junit:$junitVersion"
     testImplementation "org.mockito:mockito-core:$mockitoVersion"
-    testImplementation 'com.squareup.okhttp3:mockwebserver:4.4.0'
-    testImplementation 'org.json:json:20180813'
-    androidTestImplementation "com.android.support.test:runner:$testRunnerVersion"
-    androidTestImplementation "com.android.support.test.espresso:espresso-core:$espressoVersion"
+    testImplementation "com.squareup.okhttp3:mockwebserver:$mockwebserverVersion"
+    testImplementation 'org.json:json:20230618'
+
+    androidTestImplementation "androidx.test:runner:$testRunnerVersion"
+    androidTestImplementation "androidx.test.espresso:espresso-core:$espressoVersion"
     androidTestImplementation "org.mockito:mockito-android:$mockitoVersion"
 }
 
 task jacocoReport(type: JacocoReport, dependsOn: ['testDebugUnitTest']) {
     reports {
-        xml.enabled = true
-        html.enabled = true
+        xml.required = true
+        html.required = true
     }
 
     def fileFilter = ['**/R.class',

button-merchant/doclava-1.0.6.jar

@@ -25,39 +25,56 @@
 
 apply plugin: 'maven-publish'
 apply plugin: 'signing'
+apply plugin: 'kotlin-android'
+apply plugin: 'org.jetbrains.dokka'
 
 group = 'com.usebutton.merchant'
 version = libraryVersionName
-project.archivesBaseName = 'button-merchant'
 
-task androidJavadocs(type: Javadoc) {
-    source = android.sourceSets.main.java.source
-    title = null
-    options.docletpath = [file('./doclava-1.0.6.jar')]
-    options.classpath = classpath as List
-    options.noTimestamp = false
-    options {
-        doclet "com.google.doclava.Doclava"
-        bootClasspath new File(System.getenv('JAVA_HOME') + "/jre/lib/rt.jar")
-        addStringOption "hdf project.name", "Button Merchant Library v${libraryVersionName}"
-        addStringOption "public"
-        addStringOption "templatedir", "javadoc"
-        addStringOption "verbose"
+dokkaHtml.configure {
+    outputDirectory.set(file("$buildDir/docs/html"))
+    dokkaSourceSets {
+        named("main") {
+            moduleName.set("Button Merchant Library")
+            includeNonPublic.set(false)
+            skipEmptyPackages.set(true)
+            skipDeprecated.set(true)
+            reportUndocumented.set(false)
+            suppressInheritedMembers.set(true)
+            documentedVisibilities.set([Visibility.PUBLIC])
+        }
+    }
+}
 
-        addStringOption "federate jdk", "http://download.oracle.com/javase/6/docs/api/index.html?"
-        addStringOption "federationxml jdk", "http://doclava.googlecode.com/svn/static/api/openjdk-6.xml"
-        addStringOption "federate android", "https://d.android.com/reference"
-        addStringOption "federationxml android", "http://doclava.googlecode.com/svn/static/api/android-10.xml"
+dokkaJavadoc.configure {
+    outputDirectory.set(file("$buildDir/docs/javadoc"))
+    dokkaSourceSets {
+        named("main") {
+            moduleName.set("Button Merchant Library")
+            includeNonPublic.set(false)
+            skipEmptyPackages.set(true)
+            skipDeprecated.set(true)
+            reportUndocumented.set(false)
+            suppressInheritedMembers.set(true)
+            documentedVisibilities.set([Visibility.PUBLIC])
+        }
     }
-    exclude '**/BuildConfig.java'
-    exclude '**/R.java'
-    exclude '**/internal/**'
-    exclude '**/thirdparty/**'
 }
 
-task androidJavadocsJar(type: Jar, dependsOn: androidJavadocs) {
-    archiveClassifier.set('javadoc')
-    from new File(buildDir, '/docs/javadoc/')
+task androidHtmlDocs() {
+    dependsOn(dokkaHtml)
+}
+
+tasks.register('dokkaHtmlJar', Jar.class) {
+    dependsOn(dokkaHtml)
+    from(dokkaHtml)
+    archiveClassifier.set("html-docs")
+}
+
+tasks.register('androidJavadocsJar', Jar.class) {
+    dependsOn(dokkaJavadoc)
+    from(dokkaJavadoc)
+    archiveClassifier.set("javadoc")
 }
 
 task androidSourcesJar(type: Jar) {
@@ -93,7 +110,7 @@ afterEvaluate {
         publications {
             release(MavenPublication) {
                 groupId group
-                artifactId project.archivesBaseName
+                artifactId 'button-merchant'
                 version version
 
                 artifact("$buildDir/outputs/aar/${artifactId}-release.aar")

button-merchant/publish-maven-central.gradle

@@ -26,7 +26,6 @@
 package com.usebutton.merchant;
 
 import android.os.Looper;
-import android.support.test.InstrumentationRegistry;
 
 import org.junit.Test;
 
@@ -35,9 +34,11 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
+import androidx.test.platform.app.InstrumentationRegistry;
+
 public class MainThreadExecutorTest {
 
-    private Executor executor = new MainThreadExecutor();
+    private final Executor executor = new MainThreadExecutor();
 
     @Test
     public void executor_shouldExecute() {

button-merchant/src/androidTest/java/com/usebutton/merchant/MainThreadExecutorTest.java

@@ -25,7 +25,7 @@
 
 package com.usebutton.merchant;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import com.usebutton.merchant.module.Features;
 

button-merchant/src/main/java/com/usebutton/merchant/ActivityReportingTask.java

@@ -25,8 +25,8 @@
 
 package com.usebutton.merchant;
 
-import android.support.annotation.Nullable;
-import android.support.annotation.WorkerThread;
+import androidx.annotation.Nullable;
+import androidx.annotation.WorkerThread;
 
 import com.usebutton.merchant.exception.ButtonNetworkException;
 

button-merchant/src/main/java/com/usebutton/merchant/ButtonApi.java

@@ -25,9 +25,9 @@
 
 package com.usebutton.merchant;
 
-import android.support.annotation.Nullable;
-import android.support.annotation.VisibleForTesting;
-import android.support.annotation.WorkerThread;
+import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
+import androidx.annotation.WorkerThread;
 import android.util.Log;
 
 import com.usebutton.merchant.exception.ButtonNetworkException;