Skip to content

Commit

Permalink
Update target SDK, data and dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
Bertware committed Dec 3, 2023
1 parent 8c487a0 commit 57d97f0
Show file tree
Hide file tree
Showing 6 changed files with 640 additions and 632 deletions.
25 changes: 12 additions & 13 deletions Hyperrail/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,15 @@ apply plugin: 'com.android.application'
apply plugin: 'com.google.gms.google-services'
apply plugin: 'com.google.firebase.crashlytics'

def VERSION_CODE = 57
def VERSION_NAME = '1.3.3'
def VERSION_CODE = 58
def VERSION_NAME = '1.3.4'

android {
compileSdk 33
buildToolsVersion '33.0.0'
compileSdk 34
defaultConfig {
applicationId "be.hyperrail.android"
minSdkVersion 21
targetSdkVersion 33
targetSdkVersion 34
versionCode VERSION_CODE
versionName VERSION_NAME
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
Expand Down Expand Up @@ -47,26 +46,26 @@ android {

dependencies {
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
implementation 'com.google.android.gms:play-services-maps:18.1.0'
implementation 'com.google.android.gms:play-services-maps:18.2.0'
implementation fileTree(include: ['*.jar'], dir: 'libs')

implementation 'com.android.volley:volley:1.2.1@aar'
implementation 'joda-time:joda-time:2.11.0'
implementation 'com.squareup.picasso:picasso:2.71828'

def lifecycle_version = "2.5.1"
def lifecycle_version = "2.6.2"
// Force the same lifecycle-viewmodel for kotlin and java.
implementation "androidx.lifecycle:lifecycle-viewmodel:$lifecycle_version"
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"

implementation 'androidx.appcompat:appcompat:1.5.1'
implementation 'androidx.appcompat:appcompat:1.6.1'
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
implementation 'androidx.cardview:cardview:1.0.0'
implementation 'androidx.recyclerview:recyclerview:1.2.1'
implementation 'androidx.preference:preference:1.2.0'
implementation 'com.google.android.material:material:1.6.1'
implementation 'com.google.android.gms:play-services-location:20.0.0'
implementation 'com.google.firebase:firebase-crashlytics:18.2.13'
implementation 'androidx.recyclerview:recyclerview:1.3.2'
implementation 'androidx.preference:preference:1.2.1'
implementation 'com.google.android.material:material:1.10.0'
implementation 'com.google.android.gms:play-services-location:21.0.1'
implementation 'com.google.firebase:firebase-crashlytics:18.6.0'

testImplementation 'junit:junit:4.13.2'
testImplementation 'org.json:json:20220320'
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ buildscript {
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:7.3.1'
classpath 'com.android.tools.build:gradle:8.2.0'
classpath 'com.google.gms:google-services:4.3.15'
classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.2'
}
Expand Down
3 changes: 3 additions & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,10 @@

# Specifies the JVM arguments used for the daemon process.
# The setting is particularly useful for tweaking memory settings.
android.defaults.buildfeatures.buildconfig=true
android.enableJetifier=true
android.nonFinalResIds=false
android.nonTransitiveRClass=true
android.useAndroidX=true
org.gradle.jvmargs=-Xmx2048m

Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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-7.4-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ class IrailStopsDatabase extends SQLiteOpenHelper {
private final Resources mResources;

IrailStopsDatabase(Context context) {
super(context, "irail-stations.db", null, 2022050200);
super(context, "irail-stations.db", null, 2023120300);
this.mResources = context.getResources();
}

Expand Down
Loading

0 comments on commit 57d97f0

Please sign in to comment.