Skip to content

Commit 9080ef9

Browse files
authored
Remove check for > 1 frame when seeking (#831)
* Dependency versions bump * Remove check for > 1 frame when seeking, fixes #830
1 parent c10c4f1 commit 9080ef9

File tree

9 files changed

+42
-23
lines changed

9 files changed

+42
-23
lines changed

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
#### 1.2.28
2+
- 2023-08-29 - [commits](https://github.com/koral--/android-gif-drawable/compare/v1.2.27...v1.2.28)
3+
- Remove check for > 1 frame when seeking, fixes [(#830)](https://github.com/koral--/android-gif-drawable/pull/830), thanks @hgourvest for reporting
4+
- Update dependency versions
5+
- Update Android Gradle plugin to 8.1.1
6+
17
#### 1.2.27
28
- 2023-07-03 - [commits](https://github.com/koral--/android-gif-drawable/compare/v1.2.26...v1.2.27)
39
- Revert java to 1.8, fixes [(#826)](https://github.com/koral--/android-gif-drawable/pull/826), thanks @droplet-js for reporting

android-gif-drawable/build.gradle

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,10 @@ def isDevelopmentBuild() {
6767
}
6868

6969
tasks.register('archiveSymbols', Tar) {
70-
from new File(buildDir, 'intermediates/cmake/release/obj')
70+
def buildDirectory = layout.buildDirectory.asFile.get()
71+
from new File(buildDirectory, 'intermediates/cmake/release/obj')
7172
archiveBaseName = "${project.archivesBaseName}-symbols"
72-
destinationDirectory = new File(buildDir, 'libs')
73+
destinationDirectory = new File(buildDirectory, 'libs')
7374
archiveExtension = 'tar.gz'
7475
compression = Compression.GZIP
7576
}

android-gif-drawable/src/main/c/control.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ __unused JNIEXPORT void JNICALL
8585
Java_pl_droidsonroids_gif_GifInfoHandle_seekToTime(JNIEnv *env, jclass __unused handleClass,
8686
jlong gifInfo, jint desiredPos, jobject jbitmap) {
8787
GifInfo *info = (GifInfo *) (intptr_t) gifInfo;
88-
if (info == NULL || info->gifFilePtr->ImageCount == 1) {
88+
if (info == NULL) {
8989
return;
9090
}
9191

@@ -113,7 +113,7 @@ __unused JNIEXPORT void JNICALL
113113
Java_pl_droidsonroids_gif_GifInfoHandle_seekToFrame(JNIEnv *env, jclass __unused handleClass,
114114
jlong gifInfo, jint desiredIndex, jobject jbitmap) {
115115
GifInfo *info = (GifInfo *) (intptr_t) gifInfo;
116-
if (info == NULL || info->gifFilePtr->ImageCount == 1) {
116+
if (info == NULL) {
117117
return;
118118
}
119119

build.gradle

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
buildscript {
22
ext {
33
versions = [
4-
compileSdk : 33,
4+
compileSdk : 34,
55
targetSdk : 33,
66
minSdk : 17,
77
ndk : '25.2.9519653',
@@ -10,21 +10,21 @@ buildscript {
1010
androidxAnnotations: '1.6.0',
1111
androidxTest : '1.5.0',
1212
androidxTestRunner : '1.5.2',
13-
coroutines : '1.7.1',
14-
leakCanary : '2.11',
15-
kotlin : '1.8.22',
13+
coroutines : '1.7.3',
14+
leakCanary : '2.12',
15+
kotlin : '1.9.10',
1616
intellijAnnotations: '13.0',
1717
material : '1.9.0',
1818
androidXextJunit : '1.1.5',
19-
androidGradlePlugin: '8.0.2',
19+
androidGradlePlugin: '8.1.1',
2020
junit : '4.13.2',
21-
mockito : '5.4.0',
22-
robolectric : '4.8.1',
23-
assertj3 : '3.14.0',
21+
mockito : '5.5.0',
22+
robolectric : '4.10.3',
23+
assertj3 : '3.24.2',
2424
assertj1 : '1.7.1',
2525
concurrentunit : '0.4.6',
2626
openglApi : 'gl1.1-android-2.1_r1',
27-
mockwebserver : '4.9.0',
27+
mockwebserver : '4.9.2',
2828
relinker : '1.4.5',
2929
mavenPublishPlugin : '0.21.0',
3030
]

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ RELEASE_SIGNING_ENABLED=true
77

88
GROUP=pl.droidsonroids.gif
99
POM_ARTIFACT_ID=android-gif-drawable
10-
VERSION_NAME=1.2.27
10+
VERSION_NAME=1.2.28
1111

1212
POM_NAME=android-gif-drawable
1313
POM_DESCRIPTION=Views and Drawable for displaying animated GIFs for Android

gradle/wrapper/gradle-wrapper.jar

2.9 KB
Binary file not shown.
Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
4+
networkTimeout=10000
5+
validateDistributionUrl=true
46
zipStoreBase=GRADLE_USER_HOME
57
zipStorePath=wrapper/dists

gradlew

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
# Darwin, MinGW, and NonStop.
5656
#
5757
# (3) This script is generated from the Groovy template
58-
# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
58+
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
5959
# within the Gradle project.
6060
#
6161
# You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,13 +80,11 @@ do
8080
esac
8181
done
8282

83-
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
84-
85-
APP_NAME="Gradle"
83+
# This is normally unused
84+
# shellcheck disable=SC2034
8685
APP_BASE_NAME=${0##*/}
87-
88-
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
89-
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
86+
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
87+
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
9088

9189
# Use the maximum available, or set MAX_FD != -1 to use that value.
9290
MAX_FD=maximum
@@ -133,22 +131,29 @@ location of your Java installation."
133131
fi
134132
else
135133
JAVACMD=java
136-
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
134+
if ! command -v java >/dev/null 2>&1
135+
then
136+
die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
137137
138138
Please set the JAVA_HOME variable in your environment to match the
139139
location of your Java installation."
140+
fi
140141
fi
141142

142143
# Increase the maximum file descriptors if we can.
143144
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
144145
case $MAX_FD in #(
145146
max*)
147+
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
148+
# shellcheck disable=SC3045
146149
MAX_FD=$( ulimit -H -n ) ||
147150
warn "Could not query maximum file descriptor limit"
148151
esac
149152
case $MAX_FD in #(
150153
'' | soft) :;; #(
151154
*)
155+
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
156+
# shellcheck disable=SC3045
152157
ulimit -n "$MAX_FD" ||
153158
warn "Could not set maximum file descriptor limit to $MAX_FD"
154159
esac
@@ -193,6 +198,10 @@ if "$cygwin" || "$msys" ; then
193198
done
194199
fi
195200

201+
202+
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
203+
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
204+
196205
# Collect all arguments for the java command;
197206
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
198207
# shell script including quotes and variable substitutions, so put them in

gradlew.bat

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ if "%OS%"=="Windows_NT" setlocal
2626

2727
set DIRNAME=%~dp0
2828
if "%DIRNAME%"=="" set DIRNAME=.
29+
@rem This is normally unused
2930
set APP_BASE_NAME=%~n0
3031
set APP_HOME=%DIRNAME%
3132

0 commit comments

Comments
 (0)