kuschelyagi/text-editor-8000
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Updated support library

Browse Source
This commit is contained in:
Vlad Mihalachi 2015-03-14 13:21:11 +01:00
parent b71d27aeaa
commit 3ee11e0bfb
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@ -71,7 +71,7 @@ android {
dependencies { dependencies {
compile fileTree(dir: 'libs', include: '*.jar') compile fileTree(dir: 'libs', include: '*.jar')
compile project(':libraries:sharedCode') compile project(':libraries:sharedCode')
compile 'com.google.android.gms:play-services-ads:6.5.+' //compile 'com.google.android.gms:play-services-ads:6.5.+'
compile('com.crashlytics.sdk.android:crashlytics:2.+@aar') { compile('com.crashlytics.sdk.android:crashlytics:2.+@aar') {
transitive = true; transitive = true;
} }

8
app/src/main/AndroidManifest.xml
View File

@ -48,8 +48,8 @@
<!-- android:alwaysRetainTaskState="true" --> <!-- android:alwaysRetainTaskState="true" -->
<meta-data android:name="com.google.android.gms.version" <!--<meta-data android:name="com.google.android.gms.version"
android:value="@integer/google_play_services_version"/> android:value="@integer/google_play_services_version"/>-->
<activity <activity
android:name=".HomeActivity" android:name=".HomeActivity"
android:configChanges="fontScale|keyboard|keyboardHidden|locale|mnc|mcc|navigation|orientation|screenLayout|screenSize|smallestScreenSize|uiMode|touchscreen" android:configChanges="fontScale|keyboard|keyboardHidden|locale|mnc|mcc|navigation|orientation|screenLayout|screenSize|smallestScreenSize|uiMode|touchscreen"
@ -121,8 +121,8 @@
android:name="com.sec.android.multiwindow.MINIMUM_SIZE_H" android:name="com.sec.android.multiwindow.MINIMUM_SIZE_H"
android:value="598.0dip" /> android:value="598.0dip" />
<activity android:name="com.google.android.gms.ads.AdActivity" <!--<activity android:name="com.google.android.gms.ads.AdActivity"
android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|uiMode|screenSize|smallestScreenSize"/> android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|uiMode|screenSize|smallestScreenSize"/>-->
<meta-data android:name="com.crashlytics.ApiKey" android:value="672ab7531ce1e2e83c2ec6d84e8e94f2fa692c2a"/> <meta-data android:name="com.crashlytics.ApiKey" android:value="672ab7531ce1e2e83c2ec6d84e8e94f2fa692c2a"/>
</application> </application>

4
libraries/sharedCode/build.gradle
View File

@ -64,10 +64,10 @@ dependencies {
// compile 'com.googlecode.juniversalchardet:juniversalchardet:1.0.3' // compile 'com.googlecode.juniversalchardet:juniversalchardet:1.0.3'
compile 'org.apache.commons:commons-lang3:3.1' compile 'org.apache.commons:commons-lang3:3.1'
compile files('libs/juniversalchardet-1.0.3.jar') compile files('libs/juniversalchardet-1.0.3.jar')
compile('com.android.support:appcompat-v7:21.+') { compile('com.android.support:appcompat-v7:22.+') {
exclude group: 'com.android.support', module: 'support-v4' exclude group: 'com.android.support', module: 'support-v4'
} }
compile 'com.android.support:support-v4:21.+' compile 'com.android.support:support-v4:22.+'
compile 'com.github.gabrielemariotti.changeloglib:library:1.5.1' compile 'com.github.gabrielemariotti.changeloglib:library:1.5.1'
compile 'commons-io:commons-io:2.4' compile 'commons-io:commons-io:2.4'
compile 'com.android.support:support-annotations:20.0.0' compile 'com.android.support:support-annotations:20.0.0'