diff --git a/.gitignore b/.gitignore index 93de9b0a1..0dc390f53 100644 --- a/.gitignore +++ b/.gitignore @@ -75,7 +75,10 @@ crash.txt /publishTODO.txt .idea/copyright/ /app/google-services.json +/app/partner-keys.json /.idea/markdown-navigator/ /app/src/main/java/com/breadwallet/presenter/fragments/FragmentBreadSignal.java /fastlane/ fastlane/ +partner-keys.json +/.idea/appInsightsSettings.xml diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml index 7e340a776..ae3f30ae1 100644 --- a/.idea/kotlinc.xml +++ b/.idea/kotlinc.xml @@ -1,6 +1,6 @@ - \ No newline at end of file diff --git a/.idea/migrations.xml b/.idea/migrations.xml new file mode 100644 index 000000000..f8051a6f9 --- /dev/null +++ b/.idea/migrations.xml @@ -0,0 +1,10 @@ + + + + + + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index e53b16130..6a31e93fb 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -22,6 +22,7 @@ android { buildFeatures { dataBinding true + buildConfig true } signingConfigs { @@ -57,15 +58,15 @@ android { jvmTarget = JavaVersion.VERSION_1_8.toString() } - compileSdkVersion 32 + compileSdkVersion 34 defaultConfig { testInstrumentationRunner = 'androidx.test.runner.AndroidJUnitRunner' applicationId = 'com.loafwallet' - minSdkVersion 27 - targetSdkVersion 32 - versionCode 734 - versionName "v2.9.0" + minSdkVersion 31 + targetSdkVersion 33 + versionCode 738 + versionName "v2.9.1" multiDexEnabled true archivesBaseName = "${versionName}(${versionCode})" @@ -245,6 +246,7 @@ android { } namespace 'com.breadwallet' + buildToolsVersion '34.0.0' } task copyResDirectoryToClasses(type: Copy) { @@ -263,13 +265,13 @@ repositories { dependencies { - androidTestImplementation 'androidx.test.ext:junit:1.1.1' + androidTestImplementation 'androidx.test.ext:junit:1.1.5' androidTestImplementation 'junit:junit:4.12' - androidTestImplementation('androidx.test.espresso:espresso-core:3.4.0') - androidTestImplementation('androidx.test:runner:1.4.0') - androidTestImplementation('androidx.test:rules:1.4.0') + androidTestImplementation('androidx.test.espresso:espresso-core:3.5.1') + androidTestImplementation('androidx.test:runner:1.5.2') + androidTestImplementation('androidx.test:rules:1.5.0') implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.9' - implementation 'org.jetbrains.kotlin:kotlin-reflect:1.6.20-RC' + implementation 'org.jetbrains.kotlin:kotlin-reflect:1.9.22' // commons implementation 'commons-io:commons-io:2.4' @@ -279,35 +281,40 @@ dependencies { implementation 'org.slf4j:slf4j-api:1.7.22' // androidx - implementation 'androidx.core:core-ktx:1.7.0' - implementation 'androidx.appcompat:appcompat:1.5.1' + implementation 'androidx.core:core-ktx:1.12.0' + implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.legacy:legacy-support-v13:1.0.0' - implementation 'androidx.recyclerview:recyclerview:1.2.1' + implementation 'androidx.recyclerview:recyclerview:1.3.2' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' implementation 'androidx.gridlayout:gridlayout:1.0.0' implementation 'androidx.cardview:cardview:1.0.0' + // preferences - implementation 'androidx.preference:preference-ktx:1.2.0' + implementation 'androidx.preference:preference-ktx:1.2.1' // ChromeCustomTabs - implementation 'androidx.browser:browser:1.4.0' + implementation 'androidx.browser:browser:1.7.0' // material design - implementation 'com.google.android.material:material:1.5.0' + implementation 'com.google.android.material:material:1.11.0' implementation "androidx.lifecycle:lifecycle-extensions:2.2.0" - implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.4.1' + implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.7.0' - implementation 'com.google.zxing:core:3.4.1' + implementation 'com.google.zxing:core:3.5.2' implementation 'io.sigpipe:jbsdiff:1.0' - implementation 'com.squareup.okhttp3:okhttp:4.3.1' + implementation 'com.squareup.okhttp3:okhttp:4.12.0' // Firebase - implementation platform('com.google.firebase:firebase-bom:29.3.1') + implementation platform('com.google.firebase:firebase-bom:32.7.1') implementation 'com.google.firebase:firebase-analytics' implementation 'com.google.firebase:firebase-crashlytics' implementation 'com.google.firebase:firebase-crashlytics-ndk' + // push notifications + implementation 'com.google.firebase:firebase-messaging:23.4.0' + implementation 'com.pusher:push-notifications-android:1.8.0' + // Timber implementation 'com.jakewharton.timber:timber:4.7.1' @@ -318,15 +325,15 @@ dependencies { implementation 'com.github.razir.progressbutton:progressbutton:2.1.0' // Dagger - implementation 'com.google.dagger:dagger:2.41' - kapt 'com.google.dagger:dagger-compiler:2.41' + implementation 'com.google.dagger:dagger:2.50' + kapt 'com.google.dagger:dagger-compiler:2.50' // Play Core implementation 'com.google.android.play:core:1.10.3' implementation 'com.google.android.play:core-ktx:1.8.1' // Ktlint - ktlint 'com.pinterest:ktlint:0.44.0' + ktlint 'com.pinterest:ktlint:0.50.0' //kotlin https://stackoverflow.com/questions/69817925/problem-duplicate-class-androidx-lifecycle-viewmodel-found-in-modules def lifecycle_version = "2.4.0" @@ -348,4 +355,3 @@ task ktlintFormat(type: JavaExec, group: "formatting") { classpath = configurations.ktlint args "-F", "src/**/*.kt" } - diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index e7f739ee7..8c3883665 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - @@ -14,11 +13,15 @@ + + + + @@ -36,6 +39,7 @@ android:required="false"/> + // on below line we are getting to see the details using requested. + def requested = details.requested + // in below line we are requesting a group. + if (requested.group == 'com.android.support'){ + // on below line we are checking if the request is a group and checking if it starts with com.android.support. + if(!requested.name.startsWith("multidex")){ + // if the requested name starts with multi dex then we are displaying the use version which is given below. + details.useVersion '25.3.0' + } + } + } + } + + classpath 'com.android.tools.build:gradle:8.2.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // 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.14' + classpath 'com.google.gms:google-services:4.4.0' + + classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.9' - classpath 'com.google.firebase:firebase-crashlytics-gradle:2.8.1' } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 58bc4048e..87f66c4f2 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Thu Nov 05 22:14:52 WEST 2020 +#Sat Jan 20 19:11:29 EST 2024 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip