diff --git a/app/build.gradle b/app/build.gradle index fee5222..4d93c25 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -14,17 +14,16 @@ */ apply plugin: 'com.android.application' apply plugin: 'kotlin-android' -apply plugin: 'kotlin-android-extensions' apply plugin: 'com.google.android.gms.oss-licenses-plugin' android { - compileSdkVersion 30 + compileSdkVersion 34 buildToolsVersion "30.0.1" defaultConfig { applicationId "com.example.android.taskinterop" - minSdkVersion 16 - targetSdkVersion 30 + minSdkVersion 21 + targetSdkVersion 34 versionCode 1 versionName "1.0" multiDexEnabled true @@ -38,6 +37,9 @@ android { proguardFiles getDefaultProguardFile('proguard-android-optimize.txt') } } + buildFeatures { + buildConfig = true + } compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 @@ -45,22 +47,23 @@ android { kotlinOptions { jvmTarget = '1.8' } + namespace 'com.example.android.taskinterop' } dependencies { implementation fileTree(dir: "libs", include: ["*.jar"]) implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" - implementation 'androidx.core:core-ktx:1.3.2' - implementation 'androidx.appcompat:appcompat:1.2.0' - implementation 'com.google.android.material:material:1.2.0' - implementation 'androidx.constraintlayout:constraintlayout:2.0.1' - implementation 'com.google.android.gms:play-services-tasks:17.2.0' - implementation 'com.google.android.gms:play-services-oss-licenses:17.0.0' + 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 'com.google.android.gms:play-services-tasks:18.2.0' + implementation 'com.google.android.gms:play-services-oss-licenses:17.1.0' // Coroutines dependencies - implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.1' - implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1' + implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3' + implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3' // Lifecycle library - implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.2.0' + implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.8.3' //Task interop dependencies // [START rx_gradle] @@ -70,14 +73,14 @@ dependencies { implementation "org.jetbrains.kotlin:kotlin-scripting-jvm:$kotlin_version" // [START ktx_gradle] // Source: https://github.com/Kotlin/kotlinx.coroutines/tree/master/integration/kotlinx-coroutines-play-services - implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.4.1' + implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.7.3' // [END ktx_gradle] // [START guava_gradle] - implementation "androidx.concurrent:concurrent-futures:1.1.0" + implementation "androidx.concurrent:concurrent-futures:1.2.0" // [END guava_gradle] // Test dependencies - testImplementation 'junit:junit:4.12' - androidTestImplementation 'androidx.test.ext:junit:1.1.2' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0' + testImplementation 'junit:junit:4.13.2' + 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/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index ff8143c..91be67b 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -19,6 +19,7 @@ diff --git a/build.gradle b/build.gradle index ca743af..68f311f 100644 --- a/build.gradle +++ b/build.gradle @@ -14,15 +14,15 @@ */ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = "1.4.10" + ext.kotlin_version = "1.9.20" repositories { google() - jcenter() + mavenCentral() } dependencies { - classpath "com.android.tools.build:gradle:4.1.1" + classpath "com.android.tools.build:gradle:8.3.2" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - classpath 'com.google.android.gms:oss-licenses-plugin:0.10.2' + classpath 'com.google.android.gms:oss-licenses-plugin:0.10.6' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files @@ -32,7 +32,7 @@ buildscript { allprojects { repositories { google() - jcenter() + mavenCentral() } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index bfe87a1..40cc89a 100644 --- 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.4-bin.zip