Skip to content

Update AGP, Kotlin, Gradle, Gradle wrapper #54

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nift4 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update AGP, Kotlin, Gradle, Gradle wrapper #54

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ buildscript {
ext {
app_compat_version = '1.3.1'
constraint_layout_version = '2.1.1'
kotlin_version = '1.5.31'
kotlin_version = '2.0.20'
leanback_version = '1.1.0-rc02'
material_version = '1.4.0'
support_lib_version = '1.0.0-beta01'
Expand All @@ -28,8 +28,9 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:7.3.1'
classpath 'com.android.tools.build:gradle:8.8.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath "org.jetbrains.kotlin.kapt:org.jetbrains.kotlin.kapt.gradle.plugin:$kotlin_version"
}
}

Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
View file
Open in desktop
Binary file not shown.
5 changes: 4 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
#Fri Feb 21 18:57:16 CET 2025
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
44 changes: 31 additions & 13 deletions gradlew
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

37 changes: 21 additions & 16 deletions gradlew.bat
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 4 additions & 3 deletions mediacontroller/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,11 @@

apply plugin: 'com.android.application'
apply plugin: 'kotlin-android'
apply plugin: 'kotlin-kapt'
//apply plugin: 'kotlin-android-extensions'

android {
compileSdkVersion 31
compileSdk 33
defaultConfig {
applicationId "com.example.android.mediacontroller"
minSdkVersion 21
Expand All @@ -41,8 +42,8 @@ android {
dataBinding true
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
sourceCompatibility JavaVersion.VERSION_21
targetCompatibility JavaVersion.VERSION_21
}
namespace 'com.example.android.mediacontroller'
}
Expand Down
4 changes: 2 additions & 2 deletions mediacontroller/src/main/java/com/example/android/mediacontroller/tv/TvPresenters.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,10 @@ class MediaAppCardPresenter : Presenter() {
val card = ImageCardView(parent.context).apply {
isFocusable = true
isFocusableInTouchMode = true
findViewById<TextView>(R.id.title_text).apply {
findViewById<TextView>(androidx.leanback.R.id.title_text).apply {
ellipsize = TextUtils.TruncateAt.END
}
findViewById<TextView>(R.id.content_text).apply {
findViewById<TextView>(androidx.leanback.R.id.content_text).apply {
ellipsize = TextUtils.TruncateAt.MIDDLE
}
}
Expand Down