Skip to content
This repository was archived by the owner on Aug 22, 2024. It is now read-only.

[UPDATE] Migrate project to latest #120

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 26 additions & 0 deletions .idea/appInsightsSettings.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/compiler.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 10 additions & 0 deletions .idea/deploymentTargetSelector.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/kotlinc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 10 additions & 0 deletions .idea/migrations.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 0 additions & 9 deletions .idea/modules.xml

This file was deleted.

20 changes: 12 additions & 8 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
apply plugin: 'com.android.application'
apply plugin: 'io.fabric'
apply plugin: 'kotlin-android'
apply plugin: 'kotlin-android-extensions'
apply plugin: 'kotlin-kapt' // https://kotlinlang.org/docs/reference/kapt.html
apply plugin: 'com.google.firebase.appdistribution'
plugins {
id 'com.android.application' version '8.1.4' apply false
id 'com.google.gms.google-services' version '4.4.2' apply false
id 'com.google.firebase.crashlytics'
id 'kotlin-android'
id 'kotlin-android-extensions'
id 'kotlin-kapt' // https://kotlinlang.org/docs/reference/kapt.html
id 'com.google.firebase.appdistribution'
}

android {
compileSdkVersion rootProject.ext.androidCompileSdkVersion
Expand Down Expand Up @@ -74,6 +77,8 @@ dependencies {

// https://developer.chrome.com/multidevice/android/customtabs
implementation "androidx.browser:browser:$rootProject.supportLibraryVersion"
implementation 'com.google.firebase:firebase-crashlytics:19.0.1'
implementation 'com.google.firebase:firebase-analytics:22.0.1'

// ========================================================
// 3rd party libraries
Expand All @@ -87,7 +92,6 @@ dependencies {

// Crashlytics
// https://firebase.google.com/docs/crashlytics/get-started
implementation "com.crashlytics.sdk.android:crashlytics:$rootProject.crashlyticsVersion"

// Firebase Core
// https://firebase.google.com/docs/android/setup
Expand Down Expand Up @@ -116,7 +120,7 @@ dependencies {
androidTestImplementation("androidx.test.espresso:espresso-core:$rootProject.espressoVersion", {
exclude group: 'com.android.support', module: 'support-annotations'
})
androidTestImplementation 'androidx.test:runner:1.2.0'
androidTestImplementation 'androidx.test:runner:1.5.2'
testImplementation "androidx.arch.core:core-testing:$rootProject.archComponentVersion"
}

Expand Down
13 changes: 5 additions & 8 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ buildscript {
* - Stable: https://developer.android.com/studio/releases/gradle-plugin.html
* - Alpha: http://tools.android.com/tech-docs/new-build-system
*/
ext.androidGradleToolsVersion = '3.4.1'
ext.androidGradleToolsVersion = '7.0.0'

/*
* Fabric/Firebase gradle tools version.
Expand All @@ -42,21 +42,18 @@ buildscript {
* Firebase app dist
* https://firebase.google.com/docs/app-distribution/android/distribute-gradle
*/
ext.firebaseAppDistributionVersion = '1.0.0'
ext.firebaseAppDistributionVersion = '1.1.0'

repositories {
google()
jcenter()
maven {
url 'https://maven.fabric.io/public'
}
mavenCentral()
}
dependencies {
classpath "com.android.tools.build:gradle:$androidGradleToolsVersion"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
classpath "io.fabric.tools:gradle:$fabricGradleToolsVersion"
classpath "com.google.gms:google-services:$googlePlayServicesToolsVersion"
classpath "com.google.firebase:firebase-appdistribution-gradle:$firebaseAppDistributionVersion"
classpath 'com.google.firebase:firebase-crashlytics-gradle:3.0.1'

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
Expand All @@ -66,7 +63,7 @@ buildscript {
allprojects {
repositories {
google()
jcenter()
mavenCentral()
}
}

Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
3 changes: 1 addition & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#Mon Jun 03 23:07:44 EDT 2019
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
Loading
Loading