update gradle, target api, and zxing

build.gradle

@@ -7,7 +7,7 @@ buildscript {
  google()
  }
  dependencies {
- classpath 'com.android.tools.build:gradle:4.0.1'
+ classpath 'com.android.tools.build:gradle:7.0.0'
 // classpath 'org.robolectric:robolectric-gradle-plugin:0.11.+'
 
  // NOTE: Do not place your application dependencies here; they belong

core/build.gradle

@@ -11,20 +11,20 @@ compileJava {
 }
 
 dependencies {
- compile fileTree(dir: 'libs', include: ['*.jar'])
+ api fileTree(dir: 'libs', include: ['*.jar'])
 
- compile 'com.google.guava:guava:18.0' //TODO ToStringHelper update for 19.0+
- compile 'com.google.code.findbugs:jsr305:3.0.2' //latest as of 8/2020
- compile 'com.madgag.spongycastle:core:1.58.0.0' //latest as of 10/2022
- compile 'com.lambdaworks:scrypt:1.4.0' //latest as of 10/2022
- compile 'com.google.protobuf:protobuf-java:3.21.7' //latest as of 10/2022
- compile 'org.slf4j:slf4j-jdk14:2.0.3' //latest release ver as of 10/2022
- compile 'org.json:json:20220924' //latest as of 10/2022
- compile 'com.squareup.okhttp:okhttp:2.7.5' //latest as of 10/2022
+ api 'com.google.guava:guava:18.0' //TODO ToStringHelper update for 19.0+
+ api 'com.google.code.findbugs:jsr305:3.0.2' //latest as of 8/2020
+ api 'com.madgag.spongycastle:core:1.58.0.0' //latest as of 10/2022
+ api 'com.lambdaworks:scrypt:1.4.0' //latest as of 10/2022
+ api 'com.google.protobuf:protobuf-java:3.21.7' //latest as of 10/2022
+ api 'org.slf4j:slf4j-jdk14:2.0.3' //latest release ver as of 10/2022
+ api 'org.json:json:20220924' //latest as of 10/2022
+ api 'com.squareup.okhttp:okhttp:2.7.5' //latest as of 10/2022
 
- testCompile 'junit:junit:4.11'
- testCompile 'org.mockito:mockito-all:1.9.5'
- testCompile 'com.squareup.okhttp:mockwebserver:2.3.0'
+ testImplementation 'junit:junit:4.11'
+ testImplementation 'org.mockito:mockito-all:1.9.5'
+ testImplementation 'com.squareup.okhttp:mockwebserver:2.3.0'
 }
 
 sourceSets {

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip

wallet/build.gradle

@@ -1,8 +1,8 @@
 apply plugin: 'com.android.application'
 
 android {
- compileSdkVersion 30
- buildToolsVersion '30.0.0'
+ compileSdkVersion 31
+ buildToolsVersion '31'
 
  compileOptions {
  sourceCompatibility JavaVersion.VERSION_1_8
@@ -18,11 +18,11 @@ android {
 
  defaultConfig {
  applicationId "com.vergepay.wallet"
- minSdkVersion 21
- targetSdkVersion 30
- compileSdkVersion 30
+ minSdk 30
+ targetSdkVersion 31
+ compileSdkVersion 31
  ndkVersion "21.3.6528147" //shouldnt matter but gradle complains
- versionCode 020400
+ versionCode 020401
  versionName "v2.4"
  ndk {
  abiFilters "armeabi-v7a", "arm64-v8a"
@@ -74,7 +74,7 @@ android {
  implementation 'com.google.code.findbugs:jsr305:3.0.2' // most recent as of 10/2022
  implementation 'com.madgag.spongycastle:core:1.58.0.0' // most recent as of 10/2022
  implementation 'com.google.protobuf:protobuf-java:3.21.7' //latest as of 10/2022
- implementation 'com.google.zxing:core:3.5.0' //most recent as of 10/2022
+ implementation 'com.google.zxing:core:3.5.1' //most recent as of 7/2023
  implementation 'ch.acra:acra:4.11.1' //most recent as of 10/2022
  implementation 'com.android.support:support-v4-preferencefragment:1.0.0@aar'
  implementation 'com.jakewharton:butterknife:8.8.1' // ButterKnife.findById() is deprecated, needs findbyviewid() updates

wallet/src/main/AndroidManifest.xml

@@ -19,7 +19,7 @@
  <queries>
  <package android:name="org.torproject.android" />
  <intent>
- <action android:name="org.torproject.android.intent.action.START" />
+ <action android:name="org.torproject.android.intent.action.START" android:exported="true"/>
  </intent>
  </queries>
 
@@ -66,25 +66,22 @@
  android:name="com.vergepay.wallet.ui.WalletActivity"
  android:label="@string/app_name"
  android:theme="@style/AppTheme"
+ android:exported="false"
  android:windowSoftInputMode="adjustResize">
  <intent-filter>
  <action android:name="android.intent.action.MAIN"/>
-
  <category android:name="android.intent.category.LAUNCHER"/>
  </intent-filter>
  </activity>
  <activity
- android:name="com.vergepay.wallet.ui.SendActivity"
+ android:name="com.vergepay.wallet.ui.SendActivity" android:exported="true"
  android:label="@string/send_coins_activity_title"
  android:theme="@style/AppTheme">
  <intent-filter android:label="@string/app_name">
  <action android:name="android.intent.action.VIEW"/>
-
  <data android:scheme="bitcoin"/>
  <data android:scheme="litecoin"/>
  <data android:scheme="verge"/>
-
-
  <category android:name="android.intent.category.DEFAULT"/>
  <category android:name="android.intent.category.BROWSABLE"/>
  </intent-filter>
@@ -205,7 +202,7 @@
  android:name="android.support.PARENT_ACTIVITY"
  android:value="com.vergepay.wallet.ui.SettingsActivity"/>
  </activity>
- <activity android:name="com.vergepay.wallet.ui.ApplockActivity"/>
+ <activity android:name="com.vergepay.wallet.ui.ApplockActivity" android:exported="false"/>
  <activity
  android:name="com.vergepay.wallet.ui.DebuggingActivity"
  android:label="@string/title_activity_debugging"