-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
12 changed files
with
73 additions
and
60 deletions.
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,37 +1,40 @@ | ||
| 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 | ||
|
|
||
| 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']) | ||
| 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' | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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') | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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 |