diff --git a/app/build.gradle b/app/build.gradle index 026ae8c..9c168e7 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -14,12 +14,14 @@ * along with this program. If not, see . */ -apply plugin: 'com.android.application' -apply plugin: 'kotlin-android' -apply plugin: 'kotlin-parcelize' -apply plugin: "androidx.navigation.safeargs.kotlin" -apply plugin: 'kotlin-kapt' -apply plugin: 'com.squareup.wire' +plugins { + id 'com.android.application' + id 'org.jetbrains.kotlin.android' + id 'kotlin-parcelize' + id "androidx.navigation.safeargs.kotlin" + id 'kotlin-kapt' + id 'com.squareup.wire' +} android { namespace 'io.timelimit.android' @@ -35,9 +37,6 @@ android { arguments { arg("room.schemaLocation", "$projectDir/schemas".toString()) } - javacOptions { - option("-Xmaxerrs", 500) - } } buildConfigField 'String', 'googlePlayKey', '"MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqxGPPhjSGrSI4jfIJmw83dDGTO4Sg74nXhOoHl5Omyvxa1Hv+Tzp/wC97emXSmKq9Li2bV4q3yJLjtLJtoDmh9V1vpdyjH13qOidhIUYOtlkGexbwKz56jZwRFXGBIy0RFDDr3j5DLfUWMk0dqplLgIHDqsdUNY50419oMGKAOCX3DEw+ky+0zMY/hlUkZHnd0HLi0CYNkdZyMMYnk8OiOZ3YoDU/vz9PTf93MCAONYcXBlo3Y5hdVY2tyH4qNZh1eyqe0Trz4fRf+y1ljoa0s4ZqYskbsgpy+zUbGb82cxmATAsrdJMnNKMEa30HBvfMzKiOPR6sq3A8PPPoWT5KQIDAQAB"' buildConfigField 'String', 'backdoorPublicKey', '"30819f300d06092a864886f70d010101050003818d0030818902818100bbb0f6029315d9a2344cac25b3af1ae751447eee6308f160d68969704b6cb4674e93ad462b13a166596d0d436a546fafb78ad79fabe158eb9b17aad4945a3cf74a6a2f771e5c836547f1ce47ce866eb2b994e5984b1e3c7457da133dde02bd0d575f588cd5bcca3acbf77c30f76bde4b16911da89caafe532c2f64b4f3f1d44b0203010001"' @@ -156,7 +155,7 @@ android { } composeOptions { - kotlinCompilerExtensionVersion = "1.4.3" + kotlinCompilerExtensionVersion = "1.4.7" } } @@ -166,12 +165,12 @@ wire { dependencies { def nav_version = "2.5.3" - def room_version = "2.5.1" + def room_version = "2.5.2" def work_version = '2.8.1' - def paging_version = "3.1.1" + def paging_version = "3.2.0" implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.21" implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core:1.10.1' implementation 'androidx.cardview:cardview:1.0.0' @@ -182,7 +181,7 @@ dependencies { implementation "com.google.accompanist:accompanist-flowlayout:0.30.0" implementation 'androidx.compose.material:material-icons-extended:1.4.3' debugImplementation "androidx.compose.ui:ui-tooling:1.4.3" - implementation 'androidx.fragment:fragment-ktx:1.6.0' + implementation 'androidx.fragment:fragment-ktx:1.6.1' implementation "androidx.navigation:navigation-fragment-ktx:$nav_version" implementation "androidx.navigation:navigation-ui:$nav_version" diff --git a/build.gradle b/build.gradle index a66dc9c..f729640 100644 --- a/build.gradle +++ b/build.gradle @@ -14,32 +14,11 @@ * along with this program. If not, see . */ -// Top-level build file where you can add configuration options common to all sub-projects/modules. - -buildscript { - ext.kotlin_version = '1.8.10' - repositories { - google() - mavenCentral() - } - dependencies { - classpath 'com.android.tools.build:gradle:8.0.2' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.5.3" - classpath 'com.squareup.wire:wire-gradle-plugin:4.4.3' - - // NOTE: Do not place your application dependencies here; they belong - // in the individual module build.gradle files - } -} - -allprojects { - repositories { - google() - mavenCentral() - } -} - -task clean(type: Delete) { - delete rootProject.buildDir -} +plugins { + id 'com.android.application' version '8.1.0' apply false + id 'com.android.library' version '8.1.0' apply false + id 'org.jetbrains.kotlin.android' version "1.8.20" apply false + id 'com.google.devtools.ksp' version '1.8.21-1.0.11' apply false + id 'androidx.navigation.safeargs' version '2.6.0' apply false + id 'com.squareup.wire' version '4.4.3' apply false +} \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index 9d495b3..9e35a8d 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1,15 @@ +pluginManagement { + repositories { + gradlePluginPortal() + google() + mavenCentral() + } +} +dependencyResolutionManagement { + repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) + repositories { + google() + mavenCentral() + } +} include ':app' \ No newline at end of file