Merge pull request #7 from twitterdev/updating_dependencies

updating Fabric to the newest version
crashlytics · Feb 17, 2015 · d77001a · d77001a
2 parents 9c3f3dd + cbdf154
commit d77001a
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 10 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -56,10 +56,10 @@ repositories {
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile('com.twitter.sdk.android:twitter:1.1.1@aar') {
+    compile('com.twitter.sdk.android:twitter:1.3.0@aar') {
         transitive = true
     }
-    compile('com.mopub.sdk.android:mopub:3.1.0@aar') {
+    compile('com.mopub.sdk.android:mopub:3.3.1@aar') {
         transitive = true;
     }
     compile('com.crashlytics.sdk.android:crashlytics:2.+@aar') {

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -44,7 +44,7 @@
             android:theme="@style/AppTheme" >
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
-                android:value=".activity.ThemeChooser" />
+                android:value=".activity.ThemeChooserActivity" />
         </activity>
         <activity
             android:name=".activity.PoemHistoryActivity"
@@ -54,7 +54,7 @@
             android:theme="@style/AppTheme" >
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
-                android:value=".activity.ThemeChooser" />
+                android:value=".activity.ThemeChooserActivity" />
         </activity>
         <activity
             android:name=".activity.PoemPopularActivity"
@@ -64,7 +64,7 @@
             android:theme="@style/AppTheme" >
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
-                android:value=".activity.ThemeChooser" />
+                android:value=".activity.ThemeChooserActivity" />
         </activity>
 
         <provider
@@ -80,16 +80,16 @@
 
         <activity
             android:name="com.mopub.mobileads.MoPubActivity"
-            android:configChanges="keyboardHidden|orientation" />
+            android:configChanges="keyboardHidden|orientation|screenSize" />
         <activity
             android:name="com.mopub.mobileads.MraidActivity"
-            android:configChanges="keyboardHidden|orientation" />
+            android:configChanges="keyboardHidden|orientation|screenSize" />
         <activity
             android:name="com.mopub.common.MoPubBrowser"
-            android:configChanges="keyboardHidden|orientation" />
+            android:configChanges="keyboardHidden|orientation|screenSize" />
         <activity
             android:name="com.mopub.mobileads.MraidVideoPlayerActivity"
-            android:configChanges="keyboardHidden|orientation" />
+            android:configChanges="keyboardHidden|orientation|screenSize" />
         <activity
             android:name=".activity.AboutActivity"
             android:label="@string/title_activity_about"
@@ -99,7 +99,7 @@
 
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
-                android:value=".activity.ThemeChooser" />
+                android:value=".activity.ThemeChooserActivity" />
         </activity>
     </application>
 

diff --git a/proguard-com.mopub.sdk.android.mopub.txt b/proguard-com.mopub.sdk.android.mopub.txt
@@ -0,0 +1,17 @@
+# MoPub proguard configuration
+# '-include' this file in your proguard config
+# Autogenerated file -- Do not modify
+
+# Keep public classes and methods.
+-keepclassmembers class com.mopub.** { public *; }
+-keep public class com.mopub.**
+-keep public class android.webkit.JavascriptInterface {}
+
+# Explicitly keep any custom event classes in any package.
+-keep class * extends com.mopub.mobileads.CustomEventBanner {}
+-keep class * extends com.mopub.mobileads.CustomEventInterstitial {}
+-keep class * extends com.mopub.nativeads.CustomEventNative {}
+
+# Support for Android Advertiser ID.
+-keep class com.google.android.gms.common.GooglePlayServicesUtil {*;}
+-keep class com.google.android.gms.ads.identifier.AdvertisingIdClient {*;}
diff --git a/proguard-com.twitter.sdk.android.twitter.txt b/proguard-com.twitter.sdk.android.twitter.txt
@@ -0,0 +1,17 @@
+# Twitter Core proguard configuration
+# '-include' this file in your proguard config
+# Autogenerated file -- Do not modify
+
+# retrofit specific
+-dontwarn com.squareup.okhttp.**
+-dontwarn com.google.appengine.api.urlfetch.**
+-dontwarn rx.**
+-dontwarn retrofit.**
+-keepattributes Signature
+-keepattributes *Annotation*
+-keep class com.squareup.okhttp.** { *; }
+-keep interface com.squareup.okhttp.** { *; }
+-keep class retrofit.** { *; }
+-keepclasseswithmembers class * {
+    @retrofit.http.* <methods>;
+}