Dependency versions bump (#825)

* Dependency versions bump
Gradle to 8.1.1
Android Gradle plugin to 8.0.2
Compile & Target SDK to 33

* Release 1.2.26

Author: koral--

CHANGELOG.md

@@ -1,3 +1,12 @@
+#### 1.2.26
+- 2023-07-30 - [commits](https://github.com/koral--/android-gif-drawable/compare/v1.2.25...v1.2.26)
+- Update dependency versions
+- Update NDK to 25.2.9519653
+- Update Android Gradle plugin to 8.0.2
+- Use Java 17 for building
+- Switch to upstream ReLinker and update to 1.4.5
+- Update compile and target SDK to 33
+
 #### 1.2.25
 - 2022-08-18 - [commits](https://github.com/koral--/android-gif-drawable/compare/v1.2.24...v1.2.25)
 - Fix sample size not taken into account [(#797)](https://github.com/koral--/android-gif-drawable/pull/797) [(#798)](https://github.com/koral--/android-gif-drawable/pull/798)

README.md

@@ -22,7 +22,7 @@ Bundled GIFLib via JNI is used to render frames. This way should be more efficie
 Insert the following dependency to `build.gradle` file of your project.
 ```groovy
 dependencies {
-    implementation 'pl.droidsonroids.gif:android-gif-drawable:1.2.25'
+    implementation 'pl.droidsonroids.gif:android-gif-drawable:1.2.26'
 }
 ```
 Note that Maven central repository should be defined eg. in top-level `build.gradle` like this:

android-gif-drawable/build.gradle

@@ -9,8 +9,8 @@ android {
     compileSdkVersion versions.compileSdk
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_7
-        targetCompatibility JavaVersion.VERSION_1_7
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
 
     defaultConfig {
@@ -38,10 +38,12 @@ android {
     testOptions {
         unitTests.returnDefaultValues = true
     }
+    namespace 'pl.droidsonroids.gif'
+    testNamespace 'pl.droidsonroids.gif.test'
 }
 
 dependencies {
-    implementation "pl.droidsonroids.relinker:relinker:$versions.relinker"
+    implementation "com.getkeepsafe.relinker:relinker:$versions.relinker"
     compileOnly "androidx.annotation:annotation:$versions.androidxAnnotations"
     testCompileOnly "androidx.annotation:annotation:$versions.androidxAnnotations"
     testImplementation "junit:junit:$versions.junit"
@@ -51,26 +53,27 @@ dependencies {
     testImplementation "net.jodah:concurrentunit:$versions.concurrentunit"
     testImplementation "org.khronos:opengl-api:$versions.openglApi"
     androidTestImplementation "junit:junit:$versions.junit"
+    androidTestImplementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$versions.kotlin"
     androidTestImplementation "org.assertj:assertj-core:$versions.assertj1"
     androidTestImplementation "androidx.test.ext:junit:$versions.androidXextJunit"
     androidTestImplementation "com.squareup.okhttp3:mockwebserver:$versions.mockwebserver"
     androidTestImplementation "androidx.test:rules:$versions.androidxTest"
-    androidTestImplementation "androidx.test:runner:$versions.androidxTest"
+    androidTestImplementation "androidx.test:runner:$versions.androidxTestRunner"
     androidTestCompileOnly "androidx.annotation:annotation:$versions.androidxAnnotations"
 }
 
 def isDevelopmentBuild() {
     return project.findProperty('android.injected.invoked.from.ide') == 'true'
 }
 
-task archiveSymbols(type: Tar) {
+tasks.register('archiveSymbols', Tar) {
     from new File(buildDir, 'intermediates/cmake/release/obj')
     archiveBaseName = "${project.archivesBaseName}-symbols"
     destinationDirectory = new File(buildDir, 'libs')
     archiveExtension = 'tar.gz'
     compression = Compression.GZIP
 }
 
-configurations.all {
+configurations.configureEach {
     resolutionStrategy.force "androidx.annotation:annotation:$versions.androidxAnnotations"
-}
+}

android-gif-drawable/src/androidTest/AndroidManifest.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="pl.droidsonroids.gif">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.INTERNET" />
 </manifest>

android-gif-drawable/src/main/AndroidManifest.xml

@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="pl.droidsonroids.gif"/>
+<manifest />

android-gif-drawable/src/main/c/CMakeLists.txt

@@ -1,3 +1,4 @@
+project(androidGifDrawable)
 cmake_minimum_required(VERSION 3.4.1)
 
 set(CMAKE_VERBOSE_MAKEFILE on)

android-gif-drawable/src/main/java/pl/droidsonroids/gif/LibraryLoader.java

@@ -6,9 +6,7 @@
 import androidx.annotation.NonNull;
 
 import java.lang.reflect.Method;
-
-import pl.droidsonroids.relinker.ReLinker;
-
+import com.getkeepsafe.relinker.ReLinker;
 /**
  * Helper used to work around native libraries loading on some systems.
  * See <a href="https://medium.com/keepsafe-engineering/the-perils-of-loading-native-libraries-on-android-befa49dce2db">ReLinker</a> for more details.

build.gradle

@@ -1,29 +1,31 @@
 buildscript {
     ext {
         versions = [
-                compileSdk         : 32,
-                targetSdk          : 32,
+                compileSdk         : 33,
+                targetSdk          : 33,
                 minSdk             : 17,
-                ndk                : '25.0.8775105',
-                androidxAppcompat  : '1.5.0',
-                androidxAnnotations: '1.4.0',
-                androidxTest       : '1.4.0',
-                coroutines         : '1.6.4',
-                leakCanary         : '2.9.1',
-                kotlin             : '1.7.10',
+                ndk                : '25.2.9519653',
+                androidxAppcompat  : '1.6.1',
+                lifecycle          : '2.6.1',
+                androidxAnnotations: '1.6.0',
+                androidxTest       : '1.5.0',
+                androidxTestRunner : '1.5.2',
+                coroutines         : '1.7.1',
+                leakCanary         : '2.11',
+                kotlin             : '1.8.22',
                 intellijAnnotations: '13.0',
-                material           : '1.6.1',
-                androidXextJunit   : '1.1.3',
-                androidGradlePlugin: '7.2.0',
+                material           : '1.9.0',
+                androidXextJunit   : '1.1.5',
+                androidGradlePlugin: '8.0.2',
                 junit              : '4.13.2',
-                mockito            : '4.6.1',
-                robolectric        : '4.4',
+                mockito            : '5.4.0',
+                robolectric        : '4.8.1',
                 assertj3           : '3.14.0',
                 assertj1           : '1.7.1',
                 concurrentunit     : '0.4.6',
                 openglApi          : 'gl1.1-android-2.1_r1',
                 mockwebserver      : '4.9.0',
-                relinker           : '1.4.1',
+                relinker           : '1.4.5',
                 mavenPublishPlugin : '0.21.0',
         ]
     }
@@ -41,7 +43,7 @@ buildscript {
 
 
 subprojects {
-    tasks.withType(JavaCompile) {
+    tasks.withType(JavaCompile).configureEach {
         options.compilerArgs << '-Xlint'
     }
     repositories {

gradle.properties

@@ -1,12 +1,13 @@
 org.gradle.jvmargs=-Xmx1536M
 android.useAndroidX=true
+android.nonFinalResIds=false
 
 SONATYPE_HOST=DEFAULT
 RELEASE_SIGNING_ENABLED=true
 
 GROUP=pl.droidsonroids.gif
 POM_ARTIFACT_ID=android-gif-drawable
-VERSION_NAME=1.2.25
+VERSION_NAME=1.2.26
 
 POM_NAME=android-gif-drawable
 POM_DESCRIPTION=Views and Drawable for displaying animated GIFs for Android

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

sample/build.gradle

@@ -1,6 +1,5 @@
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
 
 android {
     ndkVersion versions.ndk
@@ -33,7 +32,18 @@ android {
             jniDebuggable true
         }
     }
-    lintOptions {
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
+    }
+    packagingOptions {
+        jniLibs {
+            useLegacyPackaging true
+        }
+    }
+    namespace 'pl.droidsonroids.gif.sample'
+    lint {
         disable 'AppCompatCustomView'
     }
 }
@@ -43,6 +53,7 @@ dependencies {
     debugImplementation "com.squareup.leakcanary:leakcanary-android:$versions.leakCanary"
     implementation "com.google.android.material:material:$versions.material"
     implementation "androidx.appcompat:appcompat:$versions.androidxAppcompat"
+    implementation "androidx.lifecycle:lifecycle-common:$versions.lifecycle"
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$versions.kotlin"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$versions.coroutines"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$versions.coroutines"

sample/gradle.properties

@@ -1,2 +1,2 @@
 android.useAndroidX = true
-android.enableJetifier = true
+android.enableJetifier = false

sample/src/main/AndroidManifest.xml

@@ -1,21 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          xmlns:tools="http://schemas.android.com/tools"
-          package="pl.droidsonroids.gif.sample">
+    xmlns:tools="http://schemas.android.com/tools">
 
-    <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.INTERNET" />
 
     <uses-feature
         android:glEsVersion="0x00020000"
-        android:required="false"/>
+        android:required="false" />
 
     <uses-feature
         android:name="android.software.live_wallpaper"
-        android:required="false"/>
+        android:required="false" />
 
     <application
         android:allowBackup="false"
-        android:extractNativeLibs="true"
         android:hardwareAccelerated="true"
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
@@ -25,25 +23,24 @@
             android:name="pl.droidsonroids.gif.sample.MainActivity"
             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
+                <action android:name="android.intent.action.MAIN" />
 
-                <category android:name="android.intent.category.LAUNCHER"/>
+                <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
         <service
             android:name=".wallpaper.GifWallpaperService"
+            android:exported="true"
             android:icon="@drawable/led7"
             android:label="@string/wallpaper_label"
-            android:permission="android.permission.BIND_WALLPAPER"
-            android:exported="true">
+            android:permission="android.permission.BIND_WALLPAPER">
             <intent-filter>
-                <action android:name="android.service.wallpaper.WallpaperService"/>
+                <action android:name="android.service.wallpaper.WallpaperService" />
             </intent-filter>
 
             <meta-data
                 android:name="android.service.wallpaper"
-                android:resource="@xml/wallpaper">
-            </meta-data>
+                android:resource="@xml/wallpaper"></meta-data>
         </service>
     </application>
 

sample/src/main/java/pl/droidsonroids/gif/sample/AnimatedSelectorFragment.kt

@@ -9,18 +9,17 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
-import kotlinx.android.synthetic.main.animated_selector.view.*
 import pl.droidsonroids.gif.GifDrawable
 
 class AnimatedSelectorFragment : Fragment() {
 
 	@Suppress("DEPRECATION")
 	override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
 		val rootView = inflater.inflate(R.layout.animated_selector, container, false)
-		rootView.buttonKotlin.setBackgroundDrawable(kotlinAnimatedBackground)
+		rootView.findViewById<View>(R.id.buttonKotlin).setBackgroundDrawable(kotlinAnimatedBackground)
 
 		if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) {
-			rootView.buttonXML.setBackgroundDrawable(xmlAnimatedBackground)
+			rootView.findViewById<View>(R.id.buttonXML).setBackgroundDrawable(xmlAnimatedBackground)
 		}
 
 		return rootView

sample/src/main/java/pl/droidsonroids/gif/sample/AnimationControlFragment.kt

@@ -4,11 +4,12 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.ToggleButton
 import androidx.fragment.app.Fragment
 import com.google.android.material.snackbar.Snackbar
-import kotlinx.android.synthetic.main.animation_control.*
 import pl.droidsonroids.gif.AnimationListener
 import pl.droidsonroids.gif.GifDrawable
+import pl.droidsonroids.gif.GifImageView
 
 class AnimationControlFragment : Fragment(), AnimationListener {
 
@@ -18,7 +19,7 @@ class AnimationControlFragment : Fragment(), AnimationListener {
 		return inflater.inflate(R.layout.animation_control, container, false)
 	}
 
-	private fun resetAnimation() {
+	private fun resetAnimation(buttonToggle: ToggleButton) {
 		gifDrawable.stop()
 		gifDrawable.loopCount = 4
 		gifDrawable.seekToFrameAndGet(5)
@@ -32,11 +33,12 @@ class AnimationControlFragment : Fragment(), AnimationListener {
 
 	override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
 		super.onViewCreated(view, savedInstanceState)
-		buttonReset.setOnClickListener { resetAnimation() }
+		val buttonToggle = view.findViewById<ToggleButton>(R.id.buttonToggle)
+		view.findViewById<View>(R.id.buttonReset).setOnClickListener { resetAnimation(buttonToggle) }
 		buttonToggle.setOnClickListener { toggleAnimation() }
-		gifDrawable = gifImageView.drawable as GifDrawable
+		gifDrawable = view.findViewById<GifImageView>(R.id.gifImageView).drawable as GifDrawable
 
-		resetAnimation()
+		resetAnimation(view.findViewById(R.id.buttonToggle))
 		gifDrawable.addAnimationListener(this)
 	}