From 1b9a4a70a559cd3aadf97a6dd7d9aab53f8d2c1d Mon Sep 17 00:00:00 2001
From: Peter Sanford <psanford@sanford.io>
Date: Wed, 23 Feb 2022 16:45:31 -0800
Subject: [PATCH] A bit of build cleanup

Remove -minsdk from command line. This shouldn't be doing anything
since we use a gradle file ourselves.

Switch "compile" to "implementation" to fix new gradle warnings.
---
 Makefile             | 2 +-
 android/build.gradle | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index e7ec009..3e67c49 100644
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,7 @@ wormhole-william.release.apk: $(AAR)
 
 $(AAR): $(shell find . -name '*.go' -o -name '*.java' -o -name '*.xml' -type f)
 	mkdir -p $(@D)
-	go run gioui.org/cmd/gogio -buildmode archive -target android -minsdk 22 -appid io.sanford.wormhole_william -o $@ .
+	go run gioui.org/cmd/gogio -buildmode archive -target android -appid io.sanford.wormhole_william -o $@ .
 
 .PHONY: clean
 clean:
diff --git a/android/build.gradle b/android/build.gradle
index 578b8d3..3770531 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -38,6 +38,6 @@ android {
 dependencies {
     implementation ':wormhole-william@aar'
     implementation 'com.android.support:appcompat-v7:26.1.0'
-    compile 'com.google.zxing:core:3.2.1'
-    compile 'com.journeyapps:zxing-android-embedded:3.2.0@aar'
+    implementation 'com.google.zxing:core:3.2.1'
+    implementation 'com.journeyapps:zxing-android-embedded:3.2.0@aar'
 }