Commit e2164ffa authored by Sajal Narang's avatar Sajal Narang Committed by GitHub

Merge pull request #212 from pulsejet/patch22

Update dependencies, make support libraries consistent
parents f8806e8a 69b450c0
apply plugin: 'com.android.application'
android {
compileSdkVersion 27
buildToolsVersion '27.0.3'
compileSdkVersion 28
buildToolsVersion '28.0.2'
defaultConfig {
applicationId "app.insti"
manifestPlaceholders 'appAuthRedirectScheme': 'https'
minSdkVersion 21
targetSdkVersion 27
targetSdkVersion 28
versionCode 17
versionName "1.0.12"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
......@@ -23,7 +23,7 @@ android {
}
ext {
supportLibVersion = '27.1.0'
supportLibVersion = '28.0.0'
playServicesVersion = '15.0.1'
retrofitVersion = '2.3.0'
okhttpVersion = '3.11.0'
......@@ -34,8 +34,9 @@ ext {
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation 'com.google.firebase:firebase-messaging:17.1.0'
implementation 'com.google.firebase:firebase-messaging:17.3.2'
implementation "com.android.support:design:${supportLibVersion}"
implementation "com.android.support:exifinterface:${supportLibVersion}"
implementation "com.android.support:support-v4:${supportLibVersion}"
implementation "com.google.android.gms:play-services-location:${playServicesVersion}"
implementation "com.squareup.retrofit2:retrofit:${retrofitVersion}"
......
......@@ -751,7 +751,7 @@ public class SlidingUpPanelLayout extends ViewGroup {
@Override
protected boolean drawChild(Canvas canvas, View child, long drawingTime) {
boolean result;
final int save = canvas.save(Canvas.CLIP_SAVE_FLAG);
final int save = canvas.save();
if (isSlidingEnabled() && mSlideableView != child) {
// Clip against the slider; no sense drawing what will immediately be covered,
......
......@@ -32,7 +32,7 @@ import android.graphics.Point;
import android.graphics.PointF;
import android.graphics.Rect;
import android.graphics.RectF;
import android.media.ExifInterface;
import android.support.media.ExifInterface;
import android.os.AsyncTask;
import android.os.Build.VERSION;
import android.os.Handler;
......@@ -1493,7 +1493,7 @@ public class SubsamplingScaleImageView extends View {
* guaranteed to be on screen.
*
* @param sCenter Target center point
* @return {@link AnimationBuilder} instance. Call {@link com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView.AnimationBuilder#start()} to start the anim.
* @return {@link AnimationBuilder} instance.
*/
public AnimationBuilder animateCenter(PointF sCenter) {
if (!isImageReady()) {
......@@ -1507,7 +1507,7 @@ public class SubsamplingScaleImageView extends View {
* beyond the panning limits, the image is automatically panned during the animation.
*
* @param scale Target scale.
* @return {@link AnimationBuilder} instance. Call {@link com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView.AnimationBuilder#start()} to start the anim.
* @return {@link AnimationBuilder} instance.
*/
public AnimationBuilder animateScale(float scale) {
if (!isImageReady()) {
......@@ -1521,7 +1521,7 @@ public class SubsamplingScaleImageView extends View {
* beyond the panning limits, the image is automatically panned during the animation.
*
* @param scale Target scale.
* @return {@link AnimationBuilder} instance. Call {@link com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView.AnimationBuilder#start()} to start the anim.
* @return {@link AnimationBuilder} instance.
*/
public AnimationBuilder animateScaleAndCenter(float scale, PointF sCenter) {
if (!isImageReady()) {
......
......@@ -9,7 +9,7 @@ buildscript {
}
dependencies {
classpath 'com.android.tools.build:gradle:3.1.3'
classpath 'com.android.tools.build:gradle:3.2.0'
classpath 'com.google.gms:google-services:3.2.0'
// NOTE: Do not place your application dependencies here; they belong
......
#Wed Mar 28 12:02:24 IST 2018
#Sun Sep 30 20:09:22 IST 2018
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment