Merge pull request #103 from r-ralph/update

Update libraries and fix some minor issues
line · Nov 17, 2021 · daecaae · daecaae
2 parents 55bb4ae + d2e3995
commit daecaae
Show file tree

Hide file tree

Showing 19 changed files with 183 additions and 142 deletions.
diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
@@ -27,7 +27,9 @@ jobs:
           ruby-version: '3.0'
           bundler-cache: true
       - name: Run lint and unit test
-        run: ./gradlew --continue :apng-drawable:testDebugUnitTest :apng-drawable:lintDebug :apng-drawable:ktlintMainSourceSetCheck
+        run: |
+          cat libpng_version | xargs ./download_libpng_and_apply_apng_patch.sh
+          ./gradlew --continue :apng-drawable:testDebugUnitTest :apng-drawable:lintDebug :apng-drawable:ktlintMainSourceSetCheck
       - name: Run Danger
         if: ${{ cancelled() != true }}
         env:

diff --git a/apng-drawable/build.gradle.kts b/apng-drawable/build.gradle.kts
@@ -5,7 +5,6 @@ plugins {
     id("kotlin-android")
     id("org.jlleitschuh.gradle.ktlint") version Versions.ktlintGradleVersion
     id("org.jetbrains.dokka") version Versions.dokkaVersion
-    id("com.github.dcendents.android-maven") version Versions.androidMavenGradlePluginVersion
     id("com.github.ben-manes.versions") version Versions.gradleVersionsPluginVersion
     `maven-publish`
     signing
@@ -16,10 +15,9 @@ version = ModuleConfig.version
 
 android {
     defaultConfig {
-        minSdkVersion(Versions.minSdkVersion)
-        compileSdkVersion(Versions.compileSdkVersion)
-        targetSdkVersion(Versions.targetSdkVersion)
-        versionName = ModuleConfig.version
+        minSdk = Versions.minSdkVersion
+        compileSdk = Versions.compileSdkVersion
+        targetSdk = Versions.targetSdkVersion
         version = ModuleConfig.version
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles(
@@ -41,7 +39,6 @@ android {
     buildTypes {
         debug {
             isMinifyEnabled = false
-            isUseProguard = false
             externalNativeBuild {
                 cmake {
                     arguments += "-DCMAKE_BUILD_TYPE=DEBUG"
@@ -52,7 +49,6 @@ android {
         }
         release {
             isMinifyEnabled = false
-            isUseProguard = false
             proguardFiles(
                 getDefaultProguardFile("proguard-android.txt"),
                 file("proguard-rules.pro")
@@ -72,7 +68,7 @@ android {
             path = file("src/main/cpp/CMakeLists.txt")
         }
     }
-    lintOptions {
+    lint {
         xmlReport = true
     }
 }
@@ -162,7 +158,7 @@ afterEvaluate {
                 val repositoryUsername: String? by project
                 val repositoryPassword: String? by project
 
-                url = uri(repositoryUrl)
+                setUrl(repositoryUrl)
                 credentials {
                     username = repositoryUsername ?: ""
                     password = repositoryPassword ?: ""

diff --git a/apng-drawable/src/main/cpp/CMakeLists.txt b/apng-drawable/src/main/cpp/CMakeLists.txt
@@ -54,31 +54,31 @@ target_link_libraries(png
 # apng-drawable
 #
 
-set(apng_drawbale_source_dir
-        ${CMAKE_CURRENT_SOURCE_DIR}/apng-drawbale
+set(apng_drawable_source_dir
+        ${CMAKE_CURRENT_SOURCE_DIR}/apng-drawable
         )
 
-set(apng_drawbale_headers
-        ${apng_drawbale_source_dir}/ApngDecoder.h
-        ${apng_drawbale_source_dir}/ApngFrame.h
-        ${apng_drawbale_source_dir}/ApngImage.h
-        ${apng_drawbale_source_dir}/Error.h
-        ${apng_drawbale_source_dir}/Log.h
-        ${apng_drawbale_source_dir}/StreamSource.h
+set(apng_drawable_headers
+        ${apng_drawable_source_dir}/ApngDecoder.h
+        ${apng_drawable_source_dir}/ApngFrame.h
+        ${apng_drawable_source_dir}/ApngImage.h
+        ${apng_drawable_source_dir}/Error.h
+        ${apng_drawable_source_dir}/Log.h
+        ${apng_drawable_source_dir}/StreamSource.h
         )
 
-set(apng_drawbale_sources
-        ${apng_drawbale_source_dir}/ApngDecoder.cpp
-        ${apng_drawbale_source_dir}/ApngDecoderJni.cpp
-        ${apng_drawbale_source_dir}/ApngFrame.cpp
-        ${apng_drawbale_source_dir}/ApngImage.cpp
-        ${apng_drawbale_source_dir}/StreamSource.cpp
+set(apng_drawable_sources
+        ${apng_drawable_source_dir}/ApngDecoder.cpp
+        ${apng_drawable_source_dir}/ApngDecoderJni.cpp
+        ${apng_drawable_source_dir}/ApngFrame.cpp
+        ${apng_drawable_source_dir}/ApngImage.cpp
+        ${apng_drawable_source_dir}/StreamSource.cpp
         )
 
 add_library(apng-drawable
         SHARED
-        ${apng_drawbale_headers}
-        ${apng_drawbale_sources}
+        ${apng_drawable_headers}
+        ${apng_drawable_sources}
         )
 
 target_include_directories(

diff --git a/...rc/main/cpp/apng-drawbale/ApngDecoder.cpp → ...rc/main/cpp/apng-drawable/ApngDecoder.cpp b/...rc/main/cpp/apng-drawbale/ApngDecoder.cpp → ...rc/main/cpp/apng-drawable/ApngDecoder.cpp
diff --git a/.../src/main/cpp/apng-drawbale/ApngDecoder.h → .../src/main/cpp/apng-drawable/ApngDecoder.h b/.../src/main/cpp/apng-drawbale/ApngDecoder.h → .../src/main/cpp/apng-drawable/ApngDecoder.h
diff --git a/...main/cpp/apng-drawbale/ApngDecoderJni.cpp → ...main/cpp/apng-drawable/ApngDecoderJni.cpp b/...main/cpp/apng-drawbale/ApngDecoderJni.cpp → ...main/cpp/apng-drawable/ApngDecoderJni.cpp
diff --git a/.../src/main/cpp/apng-drawbale/ApngFrame.cpp → .../src/main/cpp/apng-drawable/ApngFrame.cpp b/.../src/main/cpp/apng-drawbale/ApngFrame.cpp → .../src/main/cpp/apng-drawable/ApngFrame.cpp
diff --git a/...le/src/main/cpp/apng-drawbale/ApngFrame.h → ...le/src/main/cpp/apng-drawable/ApngFrame.h b/...le/src/main/cpp/apng-drawbale/ApngFrame.h → ...le/src/main/cpp/apng-drawable/ApngFrame.h
diff --git a/.../src/main/cpp/apng-drawbale/ApngImage.cpp → .../src/main/cpp/apng-drawable/ApngImage.cpp b/.../src/main/cpp/apng-drawbale/ApngImage.cpp → .../src/main/cpp/apng-drawable/ApngImage.cpp
diff --git a/...le/src/main/cpp/apng-drawbale/ApngImage.h → ...le/src/main/cpp/apng-drawable/ApngImage.h b/...le/src/main/cpp/apng-drawbale/ApngImage.h → ...le/src/main/cpp/apng-drawable/ApngImage.h
diff --git a/...awable/src/main/cpp/apng-drawbale/Error.h → ...awable/src/main/cpp/apng-drawable/Error.h b/...awable/src/main/cpp/apng-drawbale/Error.h → ...awable/src/main/cpp/apng-drawable/Error.h
diff --git a/...drawable/src/main/cpp/apng-drawbale/Log.h → ...drawable/src/main/cpp/apng-drawable/Log.h b/...drawable/src/main/cpp/apng-drawbale/Log.h → ...drawable/src/main/cpp/apng-drawable/Log.h
diff --git a/...c/main/cpp/apng-drawbale/StreamSource.cpp → ...c/main/cpp/apng-drawable/StreamSource.cpp b/...c/main/cpp/apng-drawbale/StreamSource.cpp → ...c/main/cpp/apng-drawable/StreamSource.cpp
diff --git a/...src/main/cpp/apng-drawbale/StreamSource.h → ...src/main/cpp/apng-drawable/StreamSource.h b/...src/main/cpp/apng-drawbale/StreamSource.h → ...src/main/cpp/apng-drawable/StreamSource.h
diff --git a/apng-drawable/src/main/kotlin/com/linecorp/apng/decoder/Apng.kt b/apng-drawable/src/main/kotlin/com/linecorp/apng/decoder/Apng.kt
@@ -20,7 +20,6 @@ import android.graphics.Bitmap
 import android.graphics.Canvas
 import android.graphics.Paint
 import android.graphics.Rect
-import android.os.Build
 import android.os.Trace
 import android.util.Log
 import androidx.annotation.IntRange
@@ -63,11 +62,7 @@ internal class Apng(
     private val bitmap: Bitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888)
 
     val byteCount: Int
-        get() = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
-            bitmap.allocationByteCount
-        } else {
-            bitmap.rowBytes * height
-        }
+        get() = bitmap.allocationByteCount
 
     init {
         Trace.beginSection("Apng#draw")

diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt
@@ -1,20 +1,19 @@
 object Versions {
     // Language
-    const val kotlinVersion = "1.4.30"
+    const val kotlinVersion = "1.5.30"
 
     // Plugin
-    const val androidPluginVersion = "4.2.0"
+    const val androidPluginVersion = "7.0.1"
     const val ktlintGradleVersion = "10.0.0"
     const val dokkaVersion = "1.4.20"
-    const val androidMavenGradlePluginVersion = "2.1"
     const val gradleVersionsPluginVersion = "0.36.0"
     const val nexusStagingVersion = "0.22.0"
 
     // Android
     const val minSdkVersion = 19
     const val compileSdkVersion = 30
     const val targetSdkVersion = 30
-    const val ndkVersion = "21.3.6528147"
+    const val ndkVersion = "21.4.7075529"
 
     // Library
     const val androidxAppCompatVersion = "1.0.1"

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-6.8.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists