Skip to content

Commit

Permalink
Merge pull request #12 from MohamedWael/develop
Browse files Browse the repository at this point in the history
feat: Upgrading dependencies and Gradle version
  • Loading branch information
MohamedWael authored Oct 23, 2020
2 parents dc0f48a + b9ada94 commit 0b0edc8
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 12 deletions.
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.

buildscript {
ext.kotlin_version = '1.3.72'
ext.kotlin_version = '1.4.10'
repositories {
mavenLocal()
google()
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.5.0'
classpath 'com.android.tools.build:gradle:4.1.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'

Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Sat Nov 09 11:38:44 EET 2019
#Fri Oct 23 21:57:13 EET 2020
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
16 changes: 8 additions & 8 deletions library/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -39,20 +39,20 @@ android {
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
api 'androidx.appcompat:appcompat:1.1.0'
api 'com.google.android.material:material:1.2.0-alpha06'
api 'androidx.swiperefreshlayout:swiperefreshlayout:1.0.0'
testImplementation 'junit:junit:4.13'
api 'androidx.appcompat:appcompat:1.2.0'
api 'com.google.android.material:material:1.3.0-alpha03'
api 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
testImplementation 'junit:junit:4.13.1'
// ViewModel and LiveData
api "androidx.lifecycle:lifecycle-extensions:2.2.0"
kapt "androidx.lifecycle:lifecycle-compiler:2.3.0-alpha02"
kapt "androidx.lifecycle:lifecycle-common-java8:2.3.0-beta01"
// ReactiveStreams support for LiveData
api "androidx.lifecycle:lifecycle-reactivestreams:2.3.0-alpha02"
api "androidx.lifecycle:lifecycle-reactivestreams-ktx:2.3.0-beta01"

// Paging
api "androidx.paging:paging-runtime:2.1.2"
api "androidx.paging:paging-runtime-ktx:2.1.2"
// RxJava support for Paging
api "android.arch.paging:rxjava2:1.0.1"

implementation 'com.github.MohamedWael:UtilsLibrary:develop-SNAPSHOT'
implementation 'com.github.MohamedWael:UtilsLibrary:1.0.2'
}

0 comments on commit 0b0edc8

Please sign in to comment.