diff --git a/CanonicalLayouts/feed-view/app/build.gradle b/CanonicalLayouts/feed-view/app/build.gradle index 36fb87fa6..ed060a608 100644 --- a/CanonicalLayouts/feed-view/app/build.gradle +++ b/CanonicalLayouts/feed-view/app/build.gradle @@ -20,12 +20,12 @@ plugins { } android { - compileSdk 32 + compileSdk 35 defaultConfig { applicationId "com.example.viewbasedfeedlayoutsample" minSdk 21 - targetSdk 32 + targetSdk 35 versionCode 1 versionName "1.0" @@ -48,19 +48,20 @@ android { buildFeatures { viewBinding true } + namespace 'com.example.viewbasedfeedlayoutsample' } dependencies { - implementation 'androidx.core:core-ktx:1.8.0' - implementation 'androidx.appcompat:appcompat:1.4.2' - implementation 'com.google.android.material:material:1.7.0-alpha03' + implementation 'androidx.core:core-ktx:1.13.1' + implementation 'androidx.appcompat:appcompat:1.7.0' + implementation 'com.google.android.material:material:1.12.0' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' - implementation 'androidx.navigation:navigation-fragment-ktx:2.5.1' - implementation 'androidx.navigation:navigation-ui-ktx:2.5.1' + implementation 'androidx.navigation:navigation-fragment-ktx:2.7.7' + implementation 'androidx.navigation:navigation-ui-ktx:2.7.7' implementation 'androidx.legacy:legacy-support-v4:1.0.0' - implementation 'androidx.recyclerview:recyclerview:1.2.1' + implementation 'androidx.recyclerview:recyclerview:1.3.2' implementation 'io.coil-kt:coil:2.1.0' testImplementation 'junit:junit:4.13.2' - androidTestImplementation 'androidx.test.ext:junit:1.1.3' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' + androidTestImplementation 'androidx.test.ext:junit:1.2.1' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1' } \ No newline at end of file diff --git a/CanonicalLayouts/feed-view/app/src/main/AndroidManifest.xml b/CanonicalLayouts/feed-view/app/src/main/AndroidManifest.xml index e277e76a3..2d31bfaae 100644 --- a/CanonicalLayouts/feed-view/app/src/main/AndroidManifest.xml +++ b/CanonicalLayouts/feed-view/app/src/main/AndroidManifest.xml @@ -16,8 +16,7 @@ --> + xmlns:tools="http://schemas.android.com/tools"> diff --git a/CanonicalLayouts/feed-view/build.gradle b/CanonicalLayouts/feed-view/build.gradle index 451b2b59b..a146b1b63 100644 --- a/CanonicalLayouts/feed-view/build.gradle +++ b/CanonicalLayouts/feed-view/build.gradle @@ -18,14 +18,14 @@ buildscript { google() } dependencies { - classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.5.1" + classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.7.7" } } plugins { - id 'com.android.application' version '7.2.2' apply false - id 'com.android.library' version '7.2.2' apply false - id 'org.jetbrains.kotlin.android' version '1.7.10' apply false + id 'com.android.application' version '8.6.0' apply false + id 'com.android.library' version '8.6.0' apply false + id 'org.jetbrains.kotlin.android' version '2.0.0' apply false id 'com.diffplug.spotless' version '6.9.0' } diff --git a/CanonicalLayouts/feed-view/gradle.properties b/CanonicalLayouts/feed-view/gradle.properties index cd0519bb2..022338b78 100644 --- a/CanonicalLayouts/feed-view/gradle.properties +++ b/CanonicalLayouts/feed-view/gradle.properties @@ -20,4 +20,6 @@ kotlin.code.style=official # Enables namespacing of each library's R class so that its R class includes only the # resources declared in the library itself and none from the library's dependencies, # thereby reducing the size of the R class for that library -android.nonTransitiveRClass=true \ No newline at end of file +android.nonTransitiveRClass=true +android.defaults.buildfeatures.buildconfig=true +android.nonFinalResIds=false \ No newline at end of file diff --git a/CanonicalLayouts/feed-view/gradle/wrapper/gradle-wrapper.properties b/CanonicalLayouts/feed-view/gradle/wrapper/gradle-wrapper.properties index a3c562f91..b63eae958 100644 --- a/CanonicalLayouts/feed-view/gradle/wrapper/gradle-wrapper.properties +++ b/CanonicalLayouts/feed-view/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Wed Aug 03 13:58:14 JST 2022 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME