diff --git a/.gitignore b/.gitignore index f7859de..a63ccf8 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,7 @@ /.idea/libraries /.idea/modules.xml /.idea/workspace.xml +/.idea/jarRepositories.xml .DS_Store /app/release /build diff --git a/app/build.gradle b/app/build.gradle index f3b0a15..ec12056 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -36,14 +36,14 @@ android { dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') implementation 'androidx.legacy:legacy-support-core-ui:1.0.0' - implementation 'androidx.fragment:fragment:1.1.0' + implementation 'androidx.fragment:fragment:1.2.5' implementation 'androidx.appcompat:appcompat:1.1.0' - implementation 'androidx.preference:preference:1.1.0' - implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta2' - implementation 'com.google.android.material:material:1.0.0' + implementation 'androidx.preference:preference:1.1.1' + implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta7' + implementation 'com.google.android.material:material:1.1.0' implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.0.0' implementation 'mobi.upod:time-duration-picker:1.1.3' testImplementation 'junit:junit:4.12' - androidTestImplementation 'androidx.test:runner:1.1.0-alpha4' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0-alpha4' + androidTestImplementation 'androidx.test:runner:1.3.0-rc01' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0-rc01' } diff --git a/build.gradle b/build.gradle index 4082391..50de12f 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.3.1' + classpath 'com.android.tools.build:gradle:4.0.0' // NOTE: Do not place your application dependencies here; they belong diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 7d3ccf1..56f041a 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Jan 23 08:32:40 CST 2019 +#Mon Jun 22 08:55:56 CST 2020 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip