Skip to content

Commit

Permalink
Update gradle version and dependencies (quran#1290)
Browse files Browse the repository at this point in the history
Also remove some unnecessary utility scripts.
  • Loading branch information
ahmedre authored Mar 14, 2020
1 parent 357b493 commit 74df7c8
Show file tree
Hide file tree
Showing 9 changed files with 14 additions and 159 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ android:
components:
- tools
- platform-tools
- build-tools-28.0.3
- build-tools-29.0.2
- android-28
- android-22 # required for emulator below
- extra-android-m2repository
Expand Down
2 changes: 2 additions & 0 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -125,9 +125,11 @@ dependencies {
implementation deps.kotlin.stdlib
implementation "androidx.appcompat:appcompat:${androidxAppcompatVersion}"
implementation "androidx.media:media:${androidxMediaVersion}"
implementation "androidx.localbroadcastmanager:localbroadcastmanager:${androidxLocalBroadcastVersion}"
implementation "androidx.preference:preference:${androidxPreferencesVersion}"
implementation "androidx.recyclerview:recyclerview:${androidxRecyclerViewVersion}"
implementation "com.google.android.material:material:${materialComponentsVersion}"
implementation "androidx.swiperefreshlayout:swiperefreshlayout:${androidxSwipeRefreshVersion}"
implementation "androidx.multidex:multidex:2.0.1"

// rx
Expand Down
12 changes: 7 additions & 5 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,17 +1,19 @@
buildscript {
ext {
kotlinVersion = '1.3.61'
daggerVersion = '2.26'
kotlinVersion = '1.3.70'
daggerVersion = '2.27'
androidxMediaVersion = '1.1.0'
androidxAnnotationVersion = '1.1.0'
androidxPreferencesVersion = '1.1.0'
androidxAppcompatVersion = '1.1.0'
androidxLocalBroadcastVersion = '1.0.0'
androidxSwipeRefreshVersion = '1.0.0'
androidxRecyclerViewVersion = '1.1.0'
materialComponentsVersion = '1.0.0'
materialComponentsVersion = '1.1.0'
espressoVersion = '3.2.0'
// note - 3.13.x and above require minSdk 21
okhttpVersion = '3.12.9'
workManagerVersion = '2.3.2'
workManagerVersion = '2.3.3'

deps = [
android: [
Expand Down Expand Up @@ -39,7 +41,7 @@ buildscript {
}

dependencies {
classpath 'com.android.tools.build:gradle:3.6.0'
classpath 'com.android.tools.build:gradle:4.0.0-beta02'
classpath "io.fabric.tools:gradle:1.31.2"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
classpath "net.ltgt.gradle:gradle-errorprone-plugin:1.1.1"
Expand Down
1 change: 0 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
android.enableJetifier=true
android.useAndroidX=true
android.enableSeparateAnnotationProcessing=true
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.2.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.2.2-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
3 changes: 3 additions & 0 deletions gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@ if "%DIRNAME%" == "" set DIRNAME=.
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%

@rem Resolve any "." and ".." in APP_HOME to make it shorter.
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi

@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"

Expand Down
55 changes: 0 additions & 55 deletions utils/material.sh

This file was deleted.

56 changes: 0 additions & 56 deletions utils/tanzilToSqlite.php

This file was deleted.

40 changes: 0 additions & 40 deletions utils/writeTimingDatabase.php

This file was deleted.

0 comments on commit 74df7c8

Please sign in to comment.