Dependency versions bump

Code cleanup
koral-- · Apr 23, 2020 · c125be7 · c125be7
1 parent 210a282
commit c125be7
Show file tree

Hide file tree

Showing 13 changed files with 35 additions and 45 deletions.
diff --git a/android-gif-drawable/build.gradle b/android-gif-drawable/build.gradle
@@ -1,12 +1,11 @@
 apply plugin: 'com.android.library'
-apply plugin: 'jacoco-android'
 apply from: 'gradle-mvn-push.gradle'
 
 version = VERSION_NAME
 group = GROUP
 
 android {
-    ndkVersion '21.0.6113669'
+    ndkVersion '21.1.6352462'
     compileSdkVersion versions.compileSdk
 
     compileOptions {
@@ -57,10 +56,6 @@ android {
     testOptions {
         unitTests.returnDefaultValues = true
     }
-    compileOptions {
-        sourceCompatibility 1.8
-        targetCompatibility 1.8
-    }
 }
 
 dependencies {

diff --git a/android-gif-drawable/src/main/c/gif.h b/android-gif-drawable/src/main/c/gif.h
@@ -41,7 +41,7 @@
 #define OOME_MESSAGE "Failed to allocate native memory"
 #define DEFAULT_FRAME_DURATION_MS 100
 #define STREAM_BUFFER_SIZE  8192
-#define NULL_GIF_INFO (jlong) (intptr_t) NULL;
+#define NULL_GIF_INFO (jlong) (intptr_t) NULL
 
 /**
  * Some gif files are not strictly follow 89a.

diff --git a/android-gif-drawable/src/main/java/pl/droidsonroids/gif/GifDrawable.java b/android-gif-drawable/src/main/java/pl/droidsonroids/gif/GifDrawable.java
@@ -821,9 +821,7 @@ public void setFilterBitmap(boolean filter) {
 		invalidateSelf();
 	}
 
-	@SuppressWarnings("deprecation")
 	@Override
-	@Deprecated
 	public void setDither(boolean dither) {
 		mPaint.setDither(dither);
 		invalidateSelf();

diff --git a/android-gif-drawable/src/main/java/pl/droidsonroids/gif/GifDrawableInit.java b/android-gif-drawable/src/main/java/pl/droidsonroids/gif/GifDrawableInit.java
@@ -29,7 +29,7 @@ public abstract class GifDrawableInit<T extends GifDrawableInit<T>> {
     private GifDrawable mOldDrawable;
     private ScheduledThreadPoolExecutor mExecutor;
     private boolean mIsRenderingTriggeredOnDraw = true;
-    private GifOptions mOptions = new GifOptions();
+    private final GifOptions mOptions = new GifOptions();
 
     /**
      * Used in accordance with `getThis()` pattern.

diff --git a/android-gif-drawable/src/main/java/pl/droidsonroids/gif/GifTexImage2D.java b/android-gif-drawable/src/main/java/pl/droidsonroids/gif/GifTexImage2D.java
@@ -153,7 +153,6 @@ public int getDuration() {
 	}
 
 	@Override
-	@SuppressWarnings("ThrowFromFinallyBlock")
 	protected final void finalize() throws Throwable {
 		try {
 			recycle();

diff --git a/build.gradle b/build.gradle
@@ -4,25 +4,24 @@ buildscript {
                 compileSdk         : 29,
                 targetSdk          : 29,
                 minSdk             : 17,
-                androidxAppcompat  : '1.0.2',
+                androidxAppcompat  : '1.1.0',
                 androidxAnnotations: '1.0.0',
                 androidxTest       : '1.2.0',
-                coroutines         : '1.3.1',
-                leakCanary         : '2.0-beta-2',
-                kotlin             : '1.3.50',
+                coroutines         : '1.3.5',
+                leakCanary         : '2.2',
+                kotlin             : '1.3.72',
                 intellijAnnotations: '13.0',
-                material           : '1.0.0',
-                androidXextJunit   : '1.1.0',
-                jacocoAndroid      : '0.1.4',
-                androidGradlePlugin: '3.5.0',
-                junit              : '4.12',
-                mockito            : '3.0.0',
-                robolectric        : '4.3',
+                material           : '1.1.0',
+                androidXextJunit   : '1.1.1',
+                androidGradlePlugin: '3.6.3',
+                junit              : '4.13',
+                mockito            : '3.3.3',
+                robolectric        : '4.3.1',
                 assertj3           : '3.13.2',
                 assertj1           : '1.7.1',
                 concurrentunit     : '0.4.4',
                 openglApi          : 'gl1.1-android-2.1_r1',
-                mockwebserver      : '4.1.1',
+                mockwebserver      : '4.5.0',
                 relinker           : '1.3.1'
         ]
     }
@@ -33,7 +32,6 @@ buildscript {
     }
     dependencies {
         classpath "com.android.tools.build:gradle:$versions.androidGradlePlugin"
-        classpath "com.dicedmelon.gradle:jacoco-android:$versions.jacocoAndroid"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$versions.kotlin"
     }
 }
@@ -47,4 +45,4 @@ subprojects {
         mavenCentral()
         jcenter()
     }
-}
+}
diff --git a/gradle.properties b/gradle.properties
@@ -1 +1,2 @@
-org.gradle.jvmargs=-Xmx1536M
+org.gradle.jvmargs=-Xmx1536M
+android.useAndroidX=true
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
@@ -154,19 +154,19 @@ if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
         else
             eval `echo args$i`="\"$arg\""
         fi
-        i=$((i+1))
+        i=`expr $i + 1`
     done
     case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
     esac
 fi
 
@@ -175,14 +175,9 @@ save () {
     for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
     echo " "
 }
-APP_ARGS=$(save "$@")
+APP_ARGS=`save "$@"`
 
 # Collect all arguments for the java command, following the shell quoting and substitution rules
 eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
 
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
-fi
-
 exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
@@ -29,6 +29,9 @@ if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 

diff --git a/sample/build.gradle b/sample/build.gradle
@@ -3,6 +3,7 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 
 android {
+    ndkVersion '21.1.6352462'
     compileSdkVersion versions.compileSdk
 
     defaultConfig {

diff --git a/sample/src/main/java/pl/droidsonroids/gif/sample/MainPagerAdapter.kt b/sample/src/main/java/pl/droidsonroids/gif/sample/MainPagerAdapter.kt
@@ -4,7 +4,7 @@ import androidx.fragment.app.FragmentActivity
 import androidx.fragment.app.FragmentStatePagerAdapter
 import pl.droidsonroids.gif.sample.sources.GifSourcesFragment
 
-internal class MainPagerAdapter(activity: FragmentActivity) : FragmentStatePagerAdapter(activity.supportFragmentManager) {
+internal class MainPagerAdapter(activity: FragmentActivity) : FragmentStatePagerAdapter(activity.supportFragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) {
     private val pageTitles = activity.resources.getStringArray(R.array.pages)
 
     private val fragments = arrayOf(