Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update all library and plugin versions for the usecases branch #806

Open
wants to merge 1 commit into
base: usecases
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 3 additions & 6 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,12 @@ android {
debug {
minifyEnabled false
testCoverageEnabled true
useProguard false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
testProguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguardTest-rules.pro'
}

release {
minifyEnabled true
useProguard true
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
testProguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguardTest-rules.pro'
}
Expand Down Expand Up @@ -107,7 +105,7 @@ dependencies {
kapt "androidx.room:room-compiler:$roomVersion"
implementation "androidx.room:room-ktx:$roomVersion"
implementation "androidx.lifecycle:lifecycle-extensions:$archLifecycleVersion"
kapt "androidx.lifecycle:lifecycle-compiler:$archLifecycleVersion"
implementation "androidx.lifecycle:lifecycle-common-java8:$archLifecycleVersion"
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$archLifecycleVersion"
implementation "androidx.navigation:navigation-fragment-ktx:$navigationVersion"
implementation "androidx.navigation:navigation-ui-ktx:$navigationVersion"
Expand Down Expand Up @@ -136,9 +134,8 @@ dependencies {
testImplementation "androidx.test.ext:junit-ktx:$androidXTestExtKotlinRunnerVersion"
testImplementation "androidx.test:rules:$androidXTestRulesVersion"
// Once https://issuetracker.google.com/127986458 is fixed this can be testImplementation
implementation "androidx.fragment:fragment-testing:$fragmentVersion"
testImplementation "androidx.fragment:fragment-testing:$fragmentVersion"
implementation "androidx.test:core:$androidXTestCoreVersion"
implementation "androidx.fragment:fragment:$fragmentVersion"

// AndroidX Test - Instrumented testing
androidTestImplementation "androidx.test:core-ktx:$androidXTestCoreVersion"
Expand All @@ -161,6 +158,6 @@ dependencies {
androidTestImplementation "com.google.android.material:material:$materialVersion"

// Kotlin
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion"
implementation "androidx.fragment:fragment-ktx:$fragmentKtxVersion"
}
42 changes: 21 additions & 21 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
buildscript {
ext.kotlinVersion = '1.3.31'
ext.navigationVersion = "2.1.0-alpha06"
ext.kotlinVersion = '1.5.30'
ext.navigationVersion = "2.4.0-alpha09"
repositories {
google()
jcenter()
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.4.1'
classpath 'com.android.tools.build:gradle:7.0.2'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
classpath "androidx.navigation:navigation-safe-args-gradle-plugin:$navigationVersion"

Expand All @@ -18,7 +18,7 @@ buildscript {
allprojects {
repositories {
google()
jcenter()
mavenCentral()
}
}

Expand All @@ -31,32 +31,32 @@ ext {
// Sdk and tools
// Support library and architecture components support minSdk 14 and above.
minSdkVersion = 14
targetSdkVersion = 28
compileSdkVersion = 28
targetSdkVersion = 31
compileSdkVersion = 31

// App dependencies
androidXVersion = '1.0.0'
androidXTestCoreVersion = '1.2.0'
androidXTestExtKotlinRunnerVersion = '1.1.1'
androidXTestRulesVersion = '1.2.0-beta01'
androidXAnnotations = '1.0.1'
androidXTestCoreVersion = '1.3.6'
androidXTestExtKotlinRunnerVersion = '1.1.3'
androidXTestRulesVersion = '1.4.1-alpha01'
androidXAnnotations = '1.2.0'
androidXLegacySupport = '1.0.0'
appCompatVersion = '1.0.2'
archLifecycleVersion = '2.1.0-rc01'
archTestingVersion = '2.0.0'
appCompatVersion = '1.3.1'
archLifecycleVersion = '2.4.0-beta01'
archTestingVersion = '2.1.0'
cardVersion = '1.0.0'
coroutinesVersion = '1.2.1'
dexMakerVersion = '2.12.1'
espressoVersion = '3.2.0-beta01'
fragmentVersion = '1.1.0-alpha07'
espressoVersion = '3.5.0-alpha01'
fragmentVersion = '1.4.0-alpha09'
fragmentKtxVersion = '1.1.0-rc01'
hamcrestVersion = '1.3'
junitVersion = '4.12'
materialVersion = '1.0.0'
junitVersion = '4.13.2'
materialVersion = '1.4.0'
mockitoVersion = '2.8.9'
recyclerViewVersion = '1.0.0'
robolectricVersion = '4.3-beta-1'
roomVersion = '2.1.0'
recyclerViewVersion = '1.2.1'
robolectricVersion = '4.3'
roomVersion = '2.3.0'
rulesVersion = '1.0.1'
timberVersion = '4.7.1'
truthVersion = '0.44'
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-5.1.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip