Skip to content
This repository has been archived by the owner on Apr 15, 2020. It is now read-only.

Updated versions resolves #168 #169

Open
wants to merge 2 commits into
base: master
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 26
compileSdkVersion 27
buildToolsVersion '26.0.2'

defaultConfig {
applicationId "com.github.orangegangsters.lollipin"
minSdkVersion 14
targetSdkVersion 24
targetSdkVersion 27
versionCode 1
versionName "1.0"
}
Expand All @@ -20,16 +20,17 @@ android {
}

dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
//update compile to implementation
implementation fileTree(dir: 'libs', include: ['*.jar'])

compile project(':lib')
compile 'com.android.support:appcompat-v7:26.0.2'
implementation project(':lib')
implementation 'com.android.support:appcompat-v7:27.0.2'

//Lollipop dialogs https://github.com/lewisjdeane/L-Dialogs and buttons, animations etc...
compile 'uk.me.lewisdeane.ldialogs:ldialogs:1.2.0@aar'
implementation 'uk.me.lewisdeane.ldialogs:ldialogs:1.2.0@aar'

//test
androidTestCompile 'com.jayway.android.robotium:robotium-solo:5.5.2'
androidTestImplementation 'com.jayway.android.robotium:robotium-solo:5.5.2'
}

// REQUIRED: Google's new Maven repo is required for the latest
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:2.3.3'
classpath 'com.android.tools.build:gradle:3.0.1'

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
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 @@
#Mon Apr 17 11:56:01 PDT 2017
#Wed Feb 14 12:54:53 EET 2018
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
12 changes: 6 additions & 6 deletions lib/build.gradle
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
apply plugin: 'com.android.library'

android {
compileSdkVersion 26
buildToolsVersion '26.0.1'
compileSdkVersion 27
buildToolsVersion '26.0.2'

defaultConfig {
minSdkVersion 14
targetSdkVersion 26
targetSdkVersion 27
versionCode 2
versionName VERSION_NAME
}
Expand All @@ -26,9 +26,9 @@ dependencies {
compile 'com.github.omadahealth.typefaceview:typefaceview:1.5.0@aar' //TypefaceTextView

//Compat
compile 'com.android.support:support-v4:26.0.2'
compile 'com.android.support:appcompat-v7:26.0.2'
compile "com.android.support:support-v13:26.0.2"
compile 'com.android.support:support-v4:27.0.2'
compile 'com.android.support:appcompat-v7:27.0.2'
compile "com.android.support:support-v13:27.0.2"
}
repositories {
maven {
Expand Down