diff --git a/.idea/misc.xml b/.idea/misc.xml index ab206a7..dedeb51 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -43,17 +43,7 @@ - - - - - - - - - - - + diff --git a/androidbase-account/build.gradle b/androidbase-account/build.gradle index 1cf6e1f..4cf4975 100644 --- a/androidbase-account/build.gradle +++ b/androidbase-account/build.gradle @@ -1,24 +1,27 @@ apply plugin: 'com.android.library' android { - compileSdkVersion 25 - buildToolsVersion "25.0.2" + compileSdkVersion 26 + buildToolsVersion "26.0.2" defaultConfig { minSdkVersion 15 - targetSdkVersion 25 + targetSdkVersion 26 versionCode 1 versionName "1.0" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" } + buildTypes { release { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } + + flavorDimensions "default" } dependencies { @@ -27,7 +30,7 @@ dependencies { exclude group: 'com.android.support', module: 'support-annotations' }) compile 'com.facebook.android:facebook-android-sdk:4.18.0' - compile 'com.google.android.gms:play-services-auth:11.0.4' + compile 'com.google.android.gms:play-services-auth:11.6.2' compile project(':androidbase-core') testCompile 'junit:junit:4.12' } diff --git a/androidbase-adapter/build.gradle b/androidbase-adapter/build.gradle index c122f65..4a5a063 100644 --- a/androidbase-adapter/build.gradle +++ b/androidbase-adapter/build.gradle @@ -1,24 +1,27 @@ apply plugin: 'com.android.library' android { - compileSdkVersion 25 - buildToolsVersion "25.0.2" + compileSdkVersion 26 + buildToolsVersion "26.0.2" defaultConfig { minSdkVersion 15 - targetSdkVersion 25 + targetSdkVersion 26 versionCode 1 versionName "1.0" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" } + buildTypes { release { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } + + flavorDimensions "default" } dependencies { diff --git a/androidbase-core/build.gradle b/androidbase-core/build.gradle index 94c609f..9a43cfc 100644 --- a/androidbase-core/build.gradle +++ b/androidbase-core/build.gradle @@ -1,12 +1,12 @@ apply plugin: 'com.android.library' android { - compileSdkVersion 25 - buildToolsVersion "25.0.2" + compileSdkVersion 26 + buildToolsVersion "26.0.2" defaultConfig { minSdkVersion 15 - targetSdkVersion 25 + targetSdkVersion 26 versionCode 1 versionName "1.0" vectorDrawables.useSupportLibrary = true @@ -14,12 +14,15 @@ android { testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" } + buildTypes { release { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } + + flavorDimensions "default" } dependencies { @@ -27,11 +30,11 @@ dependencies { androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', { exclude group: 'com.android.support', module: 'support-annotations' }) - compile 'com.android.support:appcompat-v7:25.3.1' - compile 'com.android.support:design:25.3.1' - compile 'com.google.android.gms:play-services-location:11.0.4' - compile 'com.google.android.gms:play-services-maps:11.0.4' - compile 'com.google.code.gson:gson:2.7' + compile 'com.android.support:appcompat-v7:26.1.0' + compile 'com.android.support:design:26.1.0' + compile 'com.google.android.gms:play-services-location:11.6.2' + compile 'com.google.android.gms:play-services-maps:11.6.2' + compile 'com.google.code.gson:gson:2.8.2' compile 'com.loopj.android:android-async-http:1.4.9' testCompile 'junit:junit:4.12' } diff --git a/androidbase-gallery/build.gradle b/androidbase-gallery/build.gradle index f4c3141..9a3518c 100644 --- a/androidbase-gallery/build.gradle +++ b/androidbase-gallery/build.gradle @@ -1,24 +1,27 @@ apply plugin: 'com.android.library' android { - compileSdkVersion 25 - buildToolsVersion "25.0.2" + compileSdkVersion 26 + buildToolsVersion "26.0.2" defaultConfig { minSdkVersion 15 - targetSdkVersion 25 + targetSdkVersion 26 versionCode 1 versionName "1.0" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" } + buildTypes { release { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } + + flavorDimensions "default" } dependencies { @@ -26,7 +29,7 @@ dependencies { androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', { exclude group: 'com.android.support', module: 'support-annotations' }) - compile 'com.github.chrisbanes:PhotoView:1.2.6' + compile 'com.github.chrisbanes:PhotoView:1.3.1' compile 'com.github.bumptech.glide:glide:3.7.0' compile project(':androidbase-core') compile project(':androidbase-share') diff --git a/androidbase-share/build.gradle b/androidbase-share/build.gradle index cc3d8fe..ad105c0 100644 --- a/androidbase-share/build.gradle +++ b/androidbase-share/build.gradle @@ -1,24 +1,27 @@ apply plugin: 'com.android.library' android { - compileSdkVersion 25 - buildToolsVersion "25.0.2" + compileSdkVersion 26 + buildToolsVersion "26.0.2" defaultConfig { minSdkVersion 15 - targetSdkVersion 25 + targetSdkVersion 26 versionCode 1 versionName "1.0" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" } + buildTypes { release { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } + + flavorDimensions "default" } dependencies { diff --git a/androidbase-tutorial/build.gradle b/androidbase-tutorial/build.gradle index e4decc1..25b3174 100644 --- a/androidbase-tutorial/build.gradle +++ b/androidbase-tutorial/build.gradle @@ -1,24 +1,27 @@ apply plugin: 'com.android.library' android { - compileSdkVersion 25 - buildToolsVersion "25.0.2" + compileSdkVersion 26 + buildToolsVersion "26.0.2" defaultConfig { minSdkVersion 15 - targetSdkVersion 25 + targetSdkVersion 26 versionCode 1 versionName "1.0" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" } + buildTypes { release { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } + + flavorDimensions "default" } dependencies { diff --git a/androidbase-webservice/build.gradle b/androidbase-webservice/build.gradle index c122f65..4a5a063 100644 --- a/androidbase-webservice/build.gradle +++ b/androidbase-webservice/build.gradle @@ -1,24 +1,27 @@ apply plugin: 'com.android.library' android { - compileSdkVersion 25 - buildToolsVersion "25.0.2" + compileSdkVersion 26 + buildToolsVersion "26.0.2" defaultConfig { minSdkVersion 15 - targetSdkVersion 25 + targetSdkVersion 26 versionCode 1 versionName "1.0" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" } + buildTypes { release { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } + + flavorDimensions "default" } dependencies { diff --git a/androidbase/build.gradle b/androidbase/build.gradle index 1ae9ec0..536f360 100644 --- a/androidbase/build.gradle +++ b/androidbase/build.gradle @@ -1,22 +1,25 @@ apply plugin: 'com.android.library' android { - compileSdkVersion 25 - buildToolsVersion "25.0.2" + compileSdkVersion 26 + buildToolsVersion "26.0.2" defaultConfig { minSdkVersion 15 - targetSdkVersion 25 + targetSdkVersion 26 versionCode 1 versionName "1.0" vectorDrawables.useSupportLibrary = true } + buildTypes { release { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } + + flavorDimensions "default" } repositories { @@ -48,13 +51,6 @@ artifacts { dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) testCompile 'junit:junit:4.12' - /*compile 'com.github.MrAPPs-RSM.MrAppsAndroidBase:androidbase-core:1.1.3' - compile 'com.github.MrAPPs-RSM.MrAppsAndroidBase:androidbase-account:1.1.3' - compile 'com.github.MrAPPs-RSM.MrAppsAndroidBase:androidbase-gallery:1.1.3' - compile 'com.github.MrAPPs-RSM.MrAppsAndroidBase:androidbase-share:1.1.3' - compile 'com.github.MrAPPs-RSM.MrAppsAndroidBase:androidbase-tutorial:1.1.3' - compile 'com.github.MrAPPs-RSM.MrAppsAndroidBase:androidbase-webservice:1.1.3' - compile 'com.github.MrAPPs-RSM.MrAppsAndroidBase:androidbase-adapter:1.1.3'*/ compile project(':androidbase-core') compile project(':androidbase-account') compile project(':androidbase-gallery') diff --git a/app/build.gradle b/app/build.gradle index 42c2c2f..f240262 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,35 +1,39 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 25 - buildToolsVersion "25.0.2" + compileSdkVersion 26 + buildToolsVersion "26.0.2" defaultConfig { applicationId "com.mr_apps.androidbaseproject" minSdkVersion 15 - targetSdkVersion 25 + targetSdkVersion 26 versionCode 1 versionName "1.0" vectorDrawables.useSupportLibrary = true testInstrumentationRunner 'android.support.test.runner.AndroidJUnitRunner' } + buildTypes { release { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } + + flavorDimensions "default" } dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) testCompile 'junit:junit:4.12' - compile 'com.android.support:appcompat-v7:25.3.1' - compile 'com.android.support:design:25.3.1' + compile 'com.android.support:appcompat-v7:26.1.0' + compile 'com.android.support:design:26.1.0' compile 'com.facebook.android:facebook-android-sdk:4.18.0' - androidTestCompile 'com.android.support:support-annotations:25.3.1' - androidTestCompile 'com.android.support.test:runner:0.5' - androidTestCompile 'com.android.support.test:rules:0.5' + androidTestCompile 'com.android.support:support-annotations:26.1.0' + androidTestCompile 'com.android.support.test:runner:1.0.1' + androidTestCompile 'com.android.support.test:rules:1.0.1' compile project(':androidbase') + compile project(':androidbase-tutorial') } diff --git a/build.gradle b/build.gradle index 4f77809..8f41310 100644 --- a/build.gradle +++ b/build.gradle @@ -3,9 +3,10 @@ buildscript { repositories { jcenter() + google() } 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 @@ -17,6 +18,7 @@ allprojects { maven { url "http://dl.bintray.com/populov/maven" } maven { url "https://jitpack.io" } jcenter() + google() } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index bac0e98..3bc36f4 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Tue Mar 21 12:23:28 CET 2017 +#Wed Nov 22 18:08:05 CET 2017 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