diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 3c41226..f1599df 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -14,10 +14,10 @@ jobs: - name: Checkout code uses: actions/checkout@v4 - - name: Set up JDK 11 + - name: Set up JDK 17 uses: actions/setup-java@v4 with: - java-version: '11' + java-version: '17' distribution: 'temurin' - name: Grant execute permission for gradlew diff --git a/app/build.gradle b/app/build.gradle index 2e6919d..219b490 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -11,21 +11,24 @@ apply plugin: 'com.google.android.gms.oss-licenses-plugin' apply plugin: 'com.google.firebase.crashlytics' repositories { - maven { url 'https://maven.google.com' } + google() + mavenCentral() } android { + namespace 'me.cutmail.disasterapp' + compileOptions { targetCompatibility = "8" sourceCompatibility = "8" } - compileSdkVersion 30 - buildToolsVersion '30.0.3' + compileSdk 34 + buildToolsVersion '34.0.0' defaultConfig { applicationId "me.cutmail.disasterapp" - minSdkVersion 26 - targetSdkVersion 30 + minSdk 26 + targetSdk 34 versionCode 22 versionName "1.9.3" } @@ -37,19 +40,18 @@ android { } dependencies { - implementation 'androidx.appcompat:appcompat:1.2.0' + implementation 'androidx.appcompat:appcompat:1.7.0' implementation 'androidx.paging:paging-runtime:2.1.2' - implementation 'com.jakewharton.timber:timber:4.7.1' + implementation 'com.jakewharton.timber:timber:5.0.1' implementation 'com.github.hotchemi:android-rate:1.0.1' - implementation 'com.firebaseui:firebase-ui-firestore:7.1.1' - implementation 'com.google.firebase:firebase-firestore:22.0.1' - implementation 'com.google.firebase:firebase-crashlytics:17.3.0' - implementation 'com.google.firebase:firebase-analytics:18.0.0' - implementation 'com.google.firebase:firebase-database:19.6.0' - implementation 'com.google.firebase:firebase-core:18.0.0' + implementation 'com.firebaseui:firebase-ui-firestore:7.2.0' + implementation 'com.google.firebase:firebase-firestore:24.10.0' + implementation 'com.google.firebase:firebase-crashlytics:19.2.1' + implementation 'com.google.firebase:firebase-analytics:22.1.2' + implementation 'com.google.firebase:firebase-database:21.0.0' implementation 'com.jakewharton:butterknife:10.2.3' annotationProcessor 'com.jakewharton:butterknife-compiler:10.2.3' - implementation 'com.google.android.gms:play-services-oss-licenses:17.0.0' + implementation 'com.google.android.gms:play-services-oss-licenses:17.1.0' } -apply plugin: 'com.google.gms.google-services' \ No newline at end of file +apply plugin: 'com.google.gms.google-services' diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 8f0f97f..612a70f 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + diff --git a/build.gradle b/build.gradle index 473381a..874fab9 100644 --- a/build.gradle +++ b/build.gradle @@ -2,25 +2,22 @@ buildscript { repositories { - jcenter() - maven { - url 'https://maven.google.com' - } google() + mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:4.1.1' + classpath 'com.android.tools.build:gradle:8.2.2' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files - classpath 'com.google.gms:google-services:4.3.4' - classpath 'com.google.android.gms:oss-licenses-plugin:0.10.2' - classpath 'com.google.firebase:firebase-crashlytics-gradle:2.4.1' + classpath 'com.google.gms:google-services:4.4.2' + classpath 'com.google.android.gms:oss-licenses-plugin:0.10.6' + classpath 'com.google.firebase:firebase-crashlytics-gradle:3.0.2' } } allprojects { repositories { - jcenter() google() + mavenCentral() } } diff --git a/gradle.properties b/gradle.properties index 915f0e6..0b858cf 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,12 +9,11 @@ # Specifies the JVM arguments used for the daemon process. # The setting is particularly useful for tweaking memory settings. -# Default value: -Xmx10248m -XX:MaxPermSize=256m -# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 +org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 # When configured, Gradle will run in incubating parallel mode. # This option should only be used with decoupled projects. More details, visit # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects # org.gradle.parallel=true -android.enableJetifier=true -android.useAndroidX=true \ No newline at end of file +android.useAndroidX=true +android.nonTransitiveRClass=true \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 96d69db..5e6b542 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,5 @@ -#Thu Jan 14 20:35:05 JST 2021 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip