Skip to content

Commit

Permalink
bump versions on protobuf, zxing, and gradle
Browse files Browse the repository at this point in the history
  • Loading branch information
justinvforvendetta committed Jul 23, 2024
1 parent 551e0ba commit d47887a
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 13 deletions.
1 change: 0 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
# org.gradle.configureondemand=true
# org.gradle.jvmargs=-Xms512m -Xmx2048m -XX:MaxPermSize=512m
#
android.defaults.buildfeatures.buildconfig=true
android.nonFinalResIds=false
android.nonTransitiveRClass=false
org.gradle.jvmargs=-Xmx1920M \
Expand Down
3 changes: 2 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#Tue Jul 23 18:23:13 EDT 2024
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
20 changes: 9 additions & 11 deletions wallet/build.gradle
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 34
buildToolsVersion '34.0.0'
compileSdkVersion 35
buildToolsVersion '35.0.0'

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
Expand All @@ -13,7 +13,7 @@ android {
defaultConfig {
applicationId "com.vergepay.wallet"
minSdk 34
targetSdkVersion 34
targetSdkVersion 35
compileSdkVersion 35
ndkVersion "21.3.6528147" //shouldn't matter but gradle complains
versionCode 2060
Expand All @@ -25,11 +25,9 @@ android {

buildTypes {
release {
minifyEnabled true
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
debug {
minifyEnabled true
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}
Expand Down Expand Up @@ -61,15 +59,15 @@ android {
// androidTestCompile 'org.robolectric:robolectric:2.3'
// androidTestCompile 'com.squareup:fest-android:1.0.+'
implementation project(':core')
implementation 'com.android.support:gridlayout-v7:28.0.0'
implementation 'com.android.support:support-v4:28.0.0'
implementation 'com.android.support:appcompat-v7:28.0.0'
implementation 'com.android.support:gridlayout-v7:28.0.0' //most recent as of 7/23/2024
implementation 'com.android.support:support-v4:28.0.0' //most recent as of 7/23/2024
implementation 'com.android.support:appcompat-v7:28.0.0' //most recent as of 7/23/2024
implementation 'com.google.guava:guava:21.0' //TODO ToStringHelper update for 19.0+
implementation 'com.google.code.findbugs:jsr305:3.0.2' // most recent as of 7/2023
implementation 'com.madgag.spongycastle:core:1.58.0.0' // most recent as of 7/2023
implementation 'com.google.protobuf:protobuf-java:3.24.3' //latest as of 10/2023
implementation 'com.google.zxing:core:3.5.2' //most recent as of 10/2023
implementation 'ch.acra:acra:4.11.1' //most recent as of 10/2023
implementation 'com.google.protobuf:protobuf-java:3.25.3' // most used as of 7/23/2024
implementation 'com.google.zxing:core:3.5.3' //most recent as of 7/23/2024
implementation 'ch.acra:acra:4.11.1' //most recent as of 7/23/2024
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
annotationProcessor 'com.jakewharton:butterknife-compiler:9.0.0'
Expand Down

0 comments on commit d47887a

Please sign in to comment.