diff options
| -rw-r--r-- | main/build.gradle | 14 | ||||
| m--------- | main/openssl | 0 | ||||
| m--------- | main/openvpn | 0 | ||||
| -rw-r--r-- | main/src/main/java/android/support/v4n/view/ViewPager.java | 2 |
4 files changed, 9 insertions, 7 deletions
diff --git a/main/build.gradle b/main/build.gradle index 7aa6005d..a1bd1521 100644 --- a/main/build.gradle +++ b/main/build.gradle @@ -12,9 +12,9 @@ repositories { } dependencies { - compile 'com.android.support:support-annotations:23.3.0' - compile 'com.android.support:cardview-v7:23.3.0' - compile 'com.android.support:recyclerview-v7:23.3.0' + compile 'com.android.support:support-annotations:24.0.0' + compile 'com.android.support:cardview-v7:24.0.0' + compile 'com.android.support:recyclerview-v7:24.0.0' // compile 'ch.acra:acra:4.5.0' testCompile 'junit:junit:4.12' @@ -25,10 +25,10 @@ android { buildToolsVersion '24.0.0' defaultConfig { - minSdkVersion '14' - targetSdkVersion '24' - versionCode = 136 - versionName = "0.6.55" + minSdkVersion 14 + targetSdkVersion 24 + versionCode = 137 + versionName = "0.6.56" } sourceSets { diff --git a/main/openssl b/main/openssl -Subproject f6da7c53fd01990e8e039dbfd5e9ea87e50d1d4 +Subproject c4feda0b636aa397cf4e731d3aef91948c3fc2b diff --git a/main/openvpn b/main/openvpn -Subproject 049858bb44a04f3a52395b523a262f9c9b7dd51 +Subproject 7349eb0b321aa92e662b05faef957bf6feb8d9d diff --git a/main/src/main/java/android/support/v4n/view/ViewPager.java b/main/src/main/java/android/support/v4n/view/ViewPager.java index b2b5238e..4e44bd99 100644 --- a/main/src/main/java/android/support/v4n/view/ViewPager.java +++ b/main/src/main/java/android/support/v4n/view/ViewPager.java @@ -16,6 +16,7 @@ package android.support.v4n.view; +import android.annotation.TargetApi; import android.content.Context; import android.content.res.Resources; import android.content.res.TypedArray; @@ -1246,6 +1247,7 @@ public class ViewPager extends ViewGroup { public static final Parcelable.Creator<SavedState> CREATOR = ParcelableCompat.newCreator(new ParcelableCompatCreatorCallbacks<SavedState>() { + @TargetApi(24) @Override public SavedState createFromParcel(Parcel in, ClassLoader loader) { return new SavedState(in, loader); |