diff --git a/app/build.gradle b/app/build.gradle index 1ec2609..ace4b72 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,13 +1,13 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 23 - buildToolsVersion "23.0.3" + compileSdkVersion 26 + buildToolsVersion '27.0.3' defaultConfig { applicationId "com.yalantis.beamazingtoday" minSdkVersion 16 - targetSdkVersion 23 + targetSdkVersion 26 versionCode 1 versionName "1.0" } @@ -20,7 +20,9 @@ android { } dependencies { - compile fileTree(include: ['*.jar'], dir: 'libs') - compile 'com.android.support:appcompat-v7:23.4.0' - compile project(':library') + implementation fileTree(include: ['*.jar'], dir: 'libs') + implementation 'com.android.support:appcompat-v7:26.0.2' + implementation project(':library') +// compile 'com.github.yalantis:todolist:v1.0.1' + } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 5e05c0e..8d6c3cb 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -3,7 +3,7 @@ diff --git a/build.gradle b/build.gradle index bdd03e7..742188a 100644 --- a/build.gradle +++ b/build.gradle @@ -1,20 +1,26 @@ buildscript { repositories { jcenter() + maven { + url "https://maven.google.com" + } + google() } dependencies { - classpath 'com.android.tools.build:gradle:2.1.3' - classpath 'com.jakewharton:butterknife-gradle-plugin:8.2.1' + classpath 'com.android.tools.build:gradle:3.1.1' classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8' + classpath 'com.jakewharton:butterknife-gradle-plugin:8.4.0' } } allprojects { repositories { jcenter() + google() + maven { url "https://jitpack.io" } } } task clean(type: Delete) { delete rootProject.buildDir -} \ No newline at end of file +} diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index c3ab459..f27e592 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Aug 22 08:24:47 EEST 2016 +#Tue Apr 17 14:05:29 CEST 2018 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.7-all.zip diff --git a/library/build.gradle b/library/build.gradle index 57bfd32..da550ee 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -1,14 +1,13 @@ apply plugin: 'com.android.library' -apply plugin: 'android-apt' apply plugin: 'com.jakewharton.butterknife' android { - compileSdkVersion 23 - buildToolsVersion "23.0.3" + compileSdkVersion 26 + buildToolsVersion '27.0.3' defaultConfig { minSdkVersion 16 - targetSdkVersion 23 + targetSdkVersion 26 versionCode 1 versionName "1.0" } @@ -21,17 +20,17 @@ android { } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) - compile 'com.android.support:appcompat-v7:23.4.0' - compile 'com.android.support:recyclerview-v7:23.4.0' - compile 'com.android.support:design:23.4.0' + implementation fileTree(dir: 'libs', include: ['*.jar']) + implementation 'com.android.support:appcompat-v7:26.0.2' + api 'com.android.support:recyclerview-v7:26.0.2' + api 'com.android.support:design:26.0.2' //RX - compile('io.reactivex:rxandroid:1.1.0') { + implementation('io.reactivex:rxandroid:1.1.0') { exclude module: 'rxjava' } - compile 'io.reactivex:rxjava:1.1.0' - compile 'com.jakewharton.rxbinding:rxbinding:0.4.0' - compile 'com.jakewharton:butterknife:8.2.1' - apt 'com.jakewharton:butterknife-compiler:8.2.1' + implementation 'io.reactivex:rxjava:1.1.0' + implementation 'com.jakewharton.rxbinding:rxbinding:0.4.0' + implementation 'com.jakewharton:butterknife:8.4.0' + annotationProcessor 'com.jakewharton:butterknife-compiler:8.4.0' } diff --git a/library/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/library/src/main/res/mipmap-xxxhdpi/ic_launcher.png index aee44e1..cde69bc 100644 Binary files a/library/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/library/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ