update gradle wrapper, agp, kotlin and libraries
* kotline 1.9.22 -> 2.0.20 * ktor 2.3.6 -> 3.0.0 * agp 8.3.0 -> 8.7.1
This commit is contained in:
		| @ -5,7 +5,7 @@ plugins { | ||||
| } | ||||
|  | ||||
| kotlin { | ||||
|     jvmToolchain 11 | ||||
|     jvmToolchain 17 | ||||
|     sourceSets.configureEach { | ||||
|         languageSettings.optIn("kotlin.RequiresOptIn") | ||||
|     } | ||||
| @ -46,22 +46,22 @@ android { | ||||
| dependencies { | ||||
|     implementation fileTree(dir: "libs", include: ["*.jar"]) | ||||
|     implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" | ||||
|     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3' | ||||
|     implementation 'org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.0' | ||||
|     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.9.0' | ||||
|     implementation 'org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3' | ||||
|  | ||||
|     implementation 'androidx.core:core-ktx:1.12.0' | ||||
|     implementation 'androidx.core:core-ktx:1.13.1' | ||||
|     implementation 'androidx.core:core-splashscreen:1.0.1' | ||||
|     implementation 'androidx.appcompat:appcompat:1.6.1' | ||||
|     implementation 'androidx.appcompat:appcompat:1.7.0' | ||||
|     implementation 'androidx.constraintlayout:constraintlayout:2.1.4' | ||||
|     implementation 'androidx.navigation:navigation-fragment-ktx:2.7.7' | ||||
|     implementation 'androidx.navigation:navigation-ui-ktx:2.7.7' | ||||
|     implementation 'androidx.navigation:navigation-fragment-ktx:2.8.3' | ||||
|     implementation 'androidx.navigation:navigation-ui-ktx:2.8.3' | ||||
|     implementation 'androidx.security:security-crypto:1.1.0-alpha06' | ||||
|     implementation 'androidx.legacy:legacy-support-v4:1.0.0' | ||||
|     implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.7.0' | ||||
|     implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.7.0' | ||||
|     implementation "androidx.paging:paging-runtime-ktx:3.2.1" | ||||
|     implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.8.6' | ||||
|     implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.6' | ||||
|     implementation "androidx.paging:paging-runtime-ktx:3.3.2" | ||||
|  | ||||
|     implementation 'com.google.android.material:material:1.11.0' | ||||
|     implementation 'com.google.android.material:material:1.12.0' | ||||
|     implementation "com.google.android.exoplayer:exoplayer-core:$exo_version" | ||||
|     implementation "com.google.android.exoplayer:exoplayer-hls:$exo_version" | ||||
|     implementation "com.google.android.exoplayer:exoplayer-dash:$exo_version" | ||||
| @ -70,7 +70,7 @@ dependencies { | ||||
|  | ||||
|     implementation 'com.facebook.shimmer:shimmer:0.5.0' | ||||
|  | ||||
|     implementation 'com.github.bumptech.glide:glide:4.15.1' | ||||
|     implementation 'com.github.bumptech.glide:glide:4.16.0' | ||||
|     implementation 'jp.wasabeef:glide-transformations:4.3.0' | ||||
|  | ||||
|     implementation "io.ktor:ktor-client-core:$ktor_version" | ||||
| @ -79,8 +79,8 @@ dependencies { | ||||
|     implementation "io.ktor:ktor-serialization-kotlinx-json:$ktor_version" | ||||
|  | ||||
|     testImplementation 'junit:junit:4.13.2' | ||||
|     androidTestImplementation 'androidx.test.ext:junit:1.1.5' | ||||
|     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1' | ||||
|     androidTestImplementation 'androidx.test.ext:junit:1.2.1' | ||||
|     androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1' | ||||
|  | ||||
| } | ||||
|  | ||||
|  | ||||
| @ -14,6 +14,8 @@ import android.widget.TextView | ||||
| import androidx.core.view.children | ||||
| import androidx.fragment.app.DialogFragment | ||||
| import androidx.lifecycle.ViewModelProvider | ||||
| import androidx.lifecycle.lifecycleScope | ||||
| import kotlinx.coroutines.launch | ||||
| import org.mosad.teapod.R | ||||
| import org.mosad.teapod.databinding.PlayerLanguageSettingsBinding | ||||
| import org.mosad.teapod.ui.activity.player.PlayerViewModel | ||||
| @ -81,8 +83,10 @@ class LanguageSettingsDialogFragment : DialogFragment() { | ||||
|         binding.buttonCloseLanguageSettings.setOnClickListener { dismiss() } | ||||
|         binding.buttonCancel.setOnClickListener { dismiss() } | ||||
|         binding.buttonSelect.setOnClickListener { | ||||
|             model.setLanguage(selectedAudioLocale, selectedSubtitleLocale) | ||||
|             dismiss() | ||||
|             lifecycleScope.launch { | ||||
|                 model.setLanguage(selectedAudioLocale, selectedSubtitleLocale) | ||||
|                 dismiss() | ||||
|             } | ||||
|         } | ||||
|  | ||||
|         // initially hide the status and navigation bar | ||||
|  | ||||
| @ -1,14 +1,14 @@ | ||||
| // Top-level build file where you can add configuration options common to all sub-projects/modules. | ||||
| buildscript { | ||||
|     ext.kotlin_version = "1.9.22" | ||||
|     ext.ktor_version = "2.3.6" | ||||
|     ext.kotlin_version = "2.0.20" | ||||
|     ext.ktor_version = "3.0.0" | ||||
|     ext.exo_version = "2.18.7" | ||||
|     repositories { | ||||
|         google() | ||||
|         mavenCentral() | ||||
|     } | ||||
|     dependencies { | ||||
|         classpath 'com.android.tools.build:gradle:8.3.0' | ||||
|         classpath 'com.android.tools.build:gradle:8.7.1' | ||||
|         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" | ||||
|  | ||||
|         // NOTE: Do not place your application dependencies here; they belong | ||||
|  | ||||
							
								
								
									
										
											BIN
										
									
								
								gradle/wrapper/gradle-wrapper.jar
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										
											BIN
										
									
								
								gradle/wrapper/gradle-wrapper.jar
									
									
									
									
										vendored
									
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										2
									
								
								gradle/wrapper/gradle-wrapper.properties
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								gradle/wrapper/gradle-wrapper.properties
									
									
									
									
										vendored
									
									
								
							| @ -1,6 +1,6 @@ | ||||
| distributionBase=GRADLE_USER_HOME | ||||
| distributionPath=wrapper/dists | ||||
| distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip | ||||
| distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip | ||||
| networkTimeout=10000 | ||||
| validateDistributionUrl=true | ||||
| zipStoreBase=GRADLE_USER_HOME | ||||
|  | ||||
							
								
								
									
										7
									
								
								gradlew
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										7
									
								
								gradlew
									
									
									
									
										vendored
									
									
								
							| @ -15,6 +15,8 @@ | ||||
| # See the License for the specific language governing permissions and | ||||
| # limitations under the License. | ||||
| # | ||||
| # SPDX-License-Identifier: Apache-2.0 | ||||
| # | ||||
|  | ||||
| ############################################################################## | ||||
| # | ||||
| @ -55,7 +57,7 @@ | ||||
| #       Darwin, MinGW, and NonStop. | ||||
| # | ||||
| #   (3) This script is generated from the Groovy template | ||||
| #       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt | ||||
| #       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt | ||||
| #       within the Gradle project. | ||||
| # | ||||
| #       You can find Gradle at https://github.com/gradle/gradle/. | ||||
| @ -84,7 +86,8 @@ done | ||||
| # shellcheck disable=SC2034 | ||||
| APP_BASE_NAME=${0##*/} | ||||
| # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) | ||||
| APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit | ||||
| APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s | ||||
| ' "$PWD" ) || exit | ||||
|  | ||||
| # Use the maximum available, or set MAX_FD != -1 to use that value. | ||||
| MAX_FD=maximum | ||||
|  | ||||
							
								
								
									
										22
									
								
								gradlew.bat
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										22
									
								
								gradlew.bat
									
									
									
									
										vendored
									
									
								
							| @ -13,6 +13,8 @@ | ||||
| @rem See the License for the specific language governing permissions and | ||||
| @rem limitations under the License. | ||||
| @rem | ||||
| @rem SPDX-License-Identifier: Apache-2.0 | ||||
| @rem | ||||
|  | ||||
| @if "%DEBUG%"=="" @echo off | ||||
| @rem ########################################################################## | ||||
| @ -43,11 +45,11 @@ set JAVA_EXE=java.exe | ||||
| %JAVA_EXE% -version >NUL 2>&1 | ||||
| if %ERRORLEVEL% equ 0 goto execute | ||||
|  | ||||
| echo. | ||||
| echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. | ||||
| echo. | ||||
| echo Please set the JAVA_HOME variable in your environment to match the | ||||
| echo location of your Java installation. | ||||
| echo. 1>&2 | ||||
| echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 | ||||
| echo. 1>&2 | ||||
| echo Please set the JAVA_HOME variable in your environment to match the 1>&2 | ||||
| echo location of your Java installation. 1>&2 | ||||
|  | ||||
| goto fail | ||||
|  | ||||
| @ -57,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe | ||||
|  | ||||
| if exist "%JAVA_EXE%" goto execute | ||||
|  | ||||
| echo. | ||||
| echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% | ||||
| echo. | ||||
| echo Please set the JAVA_HOME variable in your environment to match the | ||||
| echo location of your Java installation. | ||||
| echo. 1>&2 | ||||
| echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 | ||||
| echo. 1>&2 | ||||
| echo Please set the JAVA_HOME variable in your environment to match the 1>&2 | ||||
| echo location of your Java installation. 1>&2 | ||||
|  | ||||
| goto fail | ||||
|  | ||||
|  | ||||
		Reference in New Issue
	
	Block a user