Fix:JCenter に依存している関係でビルドが通らない

JCenter に依存している関係でビルドが通らなかった。 JCenter への依存をやめるためライブラリ・Gradle・Gradle Pluginのバージョンを更新。
lisb · Nov 8, 2024 · fc9821a · fc9821a
1 parent 2c7e4a9
commit fc9821a
Show file tree

Hide file tree

Showing 10 changed files with 44 additions and 32 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,17 +1,17 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
-    ext.kotlin_version = '1.4.21'
-    ext.android_min_sdk_version = 21
-    ext.android_target_sdk_version = 28
-    ext.android_compile_sdk_version = 29
-    ext.android_build_tools_version = '29.0.3'
+    ext.kotlin_version = '1.9.23'
+    ext.kotlin_coroutines_version = '1.8.0'
+    ext.android_min_sdk_version = 28
+    ext.android_target_sdk_version = 34
+    ext.android_compile_sdk_version = 34
 
     repositories {
-        jcenter()
         google()
+        mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.1'
+        classpath 'com.android.tools.build:gradle:8.7.2'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
@@ -20,7 +20,7 @@ buildscript {
 allprojects {
     repositories {
         mavenLocal()
-        jcenter()
         google()
+        mavenCentral()
     }
 }
diff --git a/example/build.gradle b/example/build.gradle
@@ -2,8 +2,8 @@ apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 
 android {
-    compileSdkVersion android_compile_sdk_version
-    buildToolsVersion android_build_tools_version
+    namespace "com.lisb.android.mediashrink.example"
+    compileSdk android_compile_sdk_version
 
     defaultConfig {
         minSdkVersion android_min_sdk_version
@@ -12,11 +12,20 @@ android {
         versionCode 1
         versionName "1.0"
     }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
 }
 
 dependencies {
     implementation project(':library')
-    implementation 'com.google.android.material:material:1.2.1'
+    implementation 'com.google.android.material:material:1.12.0'
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 }
 
diff --git a/example/src/main/AndroidManifest.xml b/example/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.lisb.android.mediashrink.example">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 
@@ -14,7 +13,8 @@
 
         <activity
             android:name="com.lisb.android.mediashrink.example.ExampleActivity"
-            android:label="@string/app_name" >
+            android:label="@string/app_name"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 

diff --git a/...in/res/menu/context_menu_select_video.xml → ...in/res/menu/context_menu_select_video.xml b/...in/res/menu/context_menu_select_video.xml → ...in/res/menu/context_menu_select_video.xml
diff --git a/example/gradle.properties → gradle.properties b/example/gradle.properties → gradle.properties
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
diff --git a/library/build.gradle b/library/build.gradle
@@ -3,26 +3,30 @@ apply plugin: 'kotlin-android'
 apply plugin: 'maven-publish'
 
 android {
-    compileSdkVersion android_compile_sdk_version
-    buildToolsVersion android_build_tools_version
+    namespace "com.lisb.android.mediashrink"
+    compileSdk android_compile_sdk_version
 
     defaultConfig {
         minSdkVersion android_min_sdk_version
         targetSdkVersion android_target_sdk_version
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_7
-        targetCompatibility JavaVersion.VERSION_1_7
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
+    kotlinOptions {
+        jvmTarget = "1.8"
     }
 }
 
 dependencies {
     api fileTree(dir: 'libs', include: '*.jar')
-    api 'com.jakewharton.timber:timber:4.7.1'
+    api 'com.jakewharton.timber:timber:5.0.1'
     api "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    api 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.9'
-    api 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.9'
+    api 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.0'
+    api 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.0'
 }
 
 task androidSourcesJar(type: Jar) {

diff --git a/library/src/main/AndroidManifest.xml b/library/src/main/AndroidManifest.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.lisb.android.mediashrink"
-    android:versionCode="1"
-    android:versionName="1.0" >
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application>
     </application>

diff --git a/library/src/main/java/com/lisb/android/mediashrink/MediaShrink.kt b/library/src/main/java/com/lisb/android/mediashrink/MediaShrink.kt
@@ -181,10 +181,13 @@ internal class MediaShrink(private val context: Context) {
         onProgressListener?.onProgress(progress * 100 / maxProgress)
     }
 
-    @Throws(TooMovieLongException::class)
+    @Throws(TooMovieLongException::class, IOException::class)
     private fun checkLength(metadataRetriever: MediaMetadataRetriever) {
         if (durationLimit <= 0) return
-        val durationSec = (metadataRetriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_DURATION)).toLong() / 1000
+        val duration =
+            metadataRetriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_DURATION)
+                ?: throw IOException("Failed to read duration.")
+        val durationSec = duration.toLong() / 1000
         if (durationSec > durationLimit) {
             Timber.tag(TAG).e("Movie duration(%d sec) is longer than duration limit(%d sec).",
                     durationSec, durationLimit)
@@ -205,9 +208,6 @@ internal class MediaShrink(private val context: Context) {
         private const val PROGRESS_ADD_TRACK = 10
         private const val PROGRESS_WRITE_CONTENT = 40
         fun isSupportedDevice(context: Context): Boolean {
-            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN_MR2) {
-                return false
-            }
             return OpenglUtils.supportsOpenglEs2(context)
         }
     }

diff --git a/library/src/main/java/com/lisb/android/mediashrink/VideoShrink.kt b/library/src/main/java/com/lisb/android/mediashrink/VideoShrink.kt
@@ -14,7 +14,9 @@ class VideoShrink(private val extractor: MediaExtractor,
                   metadataRetriever: MediaMetadataRetriever,
                   private val muxer: MediaMuxer,
                   private val errorCallback: UnrecoverableErrorCallback) {
-    private val rotation = metadataRetriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_VIDEO_ROTATION).toInt()
+    private val rotation =
+        metadataRetriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_VIDEO_ROTATION)
+            ?.toInt() ?: 0
     var bitRate = 0
 
     /**