Skip to content
This repository has been archived by the owner on Aug 21, 2018. It is now read-only.

Commit

Permalink
gradle fix
Browse files Browse the repository at this point in the history
  • Loading branch information
leomaxi authored May 12, 2018
1 parent fb6122e commit 1263889
Showing 1 changed file with 28 additions and 27 deletions.
55 changes: 28 additions & 27 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ apply plugin: 'com.android.application'


android {
compileSdkVersion 26
compileSdkVersion 27
buildToolsVersion '26.0.2'
defaultConfig {
applicationId "org.ole.learning.planet.planetlearning"
minSdkVersion 17
targetSdkVersion 25
targetSdkVersion 27
versionCode 2
versionName "2.1.3"
multiDexEnabled true
Expand Down Expand Up @@ -38,42 +38,43 @@ android {
}

dependencies {
compile fileTree(include: ['*.jar'], dir: 'libs')
implementation fileTree(include: ['*.jar'], dir: 'libs')
androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
exclude group: 'com.android.support', module: 'support-annotations'
})
compile 'com.android.support:multidex:1.0.1'
compile 'com.android.support:support-v4:26.+'
compile 'com.android.support:design:26.+'
compile 'com.android.support:appcompat-v7:26.+'
compile 'com.android.support.constraint:constraint-layout:1.0.2'
compile 'com.github.kittinunf.fuel:fuel-android:1.3.1'
compile 'com.couchbase.lite:couchbase-lite-android:1.+'
compile 'org.lightcouch:lightcouch:0.1.8'
compile 'com.tonyodev.fetch:fetch:1.1.5'
compile 'us.feras.mdv:markdownview:1.1.0'
compile 'com.makeramen:roundedimageview:2.3.0'
compile 'com.github.tdscientist:ShelfView:v1.0'
implementation 'com.android.support:multidex:1.0.3'
//noinspection GradleCompatible
implementation 'com.android.support:support-v4:26.1.0'
implementation 'com.android.support:design:27.1.0'
implementation 'com.android.support:appcompat-v7:27.1.0'
implementation 'com.android.support.constraint:constraint-layout:1.0.2'
implementation 'com.github.kittinunf.fuel:fuel-android:1.3.1'
implementation 'com.couchbase.lite:couchbase-lite-android:1.4.1'
implementation 'org.lightcouch:lightcouch:0.1.8'
implementation 'com.tonyodev.fetch:fetch:1.1.5'
implementation 'us.feras.mdv:markdownview:1.1.0'
implementation 'com.makeramen:roundedimageview:2.3.0'
implementation 'com.github.tdscientist:ShelfView:v1.0'

compile 'com.github.florent37:diagonallayout:1.0.4'
compile 'org.webjars.npm:jsonparse:1.2.0'
//compile 'org.apache.httpcomponents:httpclient-android:4.3.5'
compile 'com.roughike:bottom-bar:1.3.3'
compile 'com.mcxiaoke.volley:library-aar:1.0.0'
compile 'pl.droidsonroids.gif:android-gif-drawable:1.1.+'
compile 'us.feras.mdv:markdownview:1.1.0'
implementation 'com.github.florent37:diagonallayout:1.0.4'
implementation 'org.webjars.npm:jsonparse:1.2.0'
//implementation 'org.apache.httpcomponents:httpclient-android:4.3.5'
implementation 'com.roughike:bottom-bar:1.3.3'
implementation 'com.mcxiaoke.volley:library-aar:1.0.0'
implementation 'pl.droidsonroids.gif:android-gif-drawable:1.1.7'
implementation 'us.feras.mdv:markdownview:1.1.0'

compile 'com.android.support.constraint:constraint-layout:1.0.2'
compile 'com.github.marcoscgdev:DialogSheet:1.0.2'
compile 'com.ramotion.circlemenu:circle-menu:0.2.1'
implementation 'com.android.support.constraint:constraint-layout:1.0.2'
implementation 'com.github.marcoscgdev:DialogSheet:1.0.2'
implementation 'com.ramotion.circlemenu:circle-menu:0.2.1'

compile files('libs/PBKDF2-1.0.4.jar')
implementation files('libs/PBKDF2-1.0.4.jar')
testCompile 'junit:junit:4.12'
}
}
dependencies {
implementation 'com.android.support.constraint:constraint-layout:1.0.2'
compile 'com.android.support:support-v4:26.+'
compile 'com.android.support:support-v4:27.+'
}


Expand Down

0 comments on commit 1263889

Please sign in to comment.