Merge pull request #56 from square/support-for-1.7.6

Bump readerSdkVersion 1.7.6 and targetSdkVersion to 34

Author: JonathanNakhla-Square

README.md

@@ -1,7 +1,7 @@
 # Reader SDK Quick Start Sample Android App
 
 
-Follow the Reader SDK [Quick Start Guide](https://docs.connect.squareup.com/payments/readersdk/quickstart) to start taking cash and credit card payments with Reader SDK.
+Follow the Reader SDK [Quick Start Guide](https://developer.squareup.com/docs/reader-sdk/quick-start/start) to start taking cash and credit card payments with Reader SDK.
 
 ## License
 

app/build.gradle

@@ -1,12 +1,11 @@
 apply plugin: 'com.android.application'
 
 android {
-  compileSdkVersion 33
-  buildToolsVersion "30.0.3"
   defaultConfig {
     applicationId "com.example.readersdk"
     minSdkVersion 24
-    targetSdkVersion 33
+    targetSdkVersion 34
+    compileSdk 34
     multiDexEnabled true
     versionCode 1050
     versionName "1.5"
@@ -15,7 +14,9 @@ android {
   // The native libraries from Block are already stripped, and contain security
   // measures that can be disturbed if Gradle attempts to strip them again.
   packagingOptions {
-    doNotStrip "*/*/libregister.so"
+    jniLibs {
+      keepDebugSymbols += ['*/*/libregister.so']
+    }
   }
 
   dexOptions {
@@ -27,6 +28,7 @@ android {
     sourceCompatibility JavaVersion.VERSION_1_8
     targetCompatibility JavaVersion.VERSION_1_8
   }
+  namespace 'com.example.readersdk'
 }
 
 repositories {
@@ -44,7 +46,7 @@ repositories {
 }
 
 dependencies {
-  def readerSdkVersion = "1.7.5"
+  def readerSdkVersion = "1.7.6"
   // SQUARE_READER_SDK_APPLICATION_ID is defined in ./gradle.properties
   implementation "com.squareup.sdk.reader:reader-sdk-$SQUARE_READER_SDK_APPLICATION_ID:$readerSdkVersion"
   runtimeOnly "com.squareup.sdk.reader:reader-sdk-internals:$readerSdkVersion"

app/src/main/AndroidManifest.xml

@@ -1,6 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.example.readersdk">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
   <!-- This is needed to scan QR codes, not a requirement for Reader SDK. -->
   <uses-permission android:name="android.permission.CAMERA"/>

build.gradle

@@ -4,7 +4,7 @@ buildscript {
     google()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:7.0.4'
+    classpath 'com.android.tools.build:gradle:8.4.2'
   }
 }
 

gradle.properties

@@ -11,3 +11,6 @@ org.gradle.jvmargs=-Xmx4g
 android.useAndroidX=true
 
 android.enableJetifier=true
+android.defaults.buildfeatures.buildconfig=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists