Updated compileSdk and targetSdk to Android 14
This commit is contained in:
1 parent
fc0b995bac
commit
dca3f2c773
9 files changed
+16
-59
No files matched your search
@@ -10,11 +10,11 @@ kotlin {
|
|||||||
|
|
||||||
android {
|
android {
|
||||||
namespace = "com.rtbishop.look4sat"
|
namespace = "com.rtbishop.look4sat"
|
||||||
compileSdk = 33
|
compileSdk = 34
|
||||||
defaultConfig {
|
defaultConfig {
|
||||||
applicationId = "com.rtbishop.look4sat"
|
applicationId = "com.rtbishop.look4sat"
|
||||||
minSdk = 21
|
minSdk = 21
|
||||||
targetSdk = 33
|
targetSdk = 34
|
||||||
versionCode = 313
|
versionCode = 313
|
||||||
versionName = "3.1.3"
|
versionName = "3.1.3"
|
||||||
resourceConfigurations.addAll(listOf("en", "ru", "si", "zh-rCN", "anydpi"))
|
resourceConfigurations.addAll(listOf("en", "ru", "si", "zh-rCN", "anydpi"))
|
||||||
@@ -44,22 +44,22 @@ dependencies {
|
|||||||
ksp("androidx.room:room-compiler:2.5.2")
|
ksp("androidx.room:room-compiler:2.5.2")
|
||||||
|
|
||||||
implementation("androidx.activity:activity-compose:1.7.2")
|
implementation("androidx.activity:activity-compose:1.7.2")
|
||||||
implementation("androidx.compose.animation:animation:1.4.3")
|
implementation("androidx.compose.animation:animation:1.5.0")
|
||||||
implementation("androidx.compose.compiler:compiler:1.5.1")
|
implementation("androidx.compose.compiler:compiler:1.5.1")
|
||||||
implementation("androidx.compose.material3:material3:1.1.1")
|
implementation("androidx.compose.material3:material3:1.1.1")
|
||||||
implementation("androidx.compose.runtime:runtime:1.4.3")
|
implementation("androidx.compose.runtime:runtime:1.5.0")
|
||||||
implementation("androidx.compose.ui:ui-tooling-preview:1.4.3")
|
implementation("androidx.compose.ui:ui-tooling-preview:1.5.0")
|
||||||
implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.6.1")
|
implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.6.1")
|
||||||
implementation("androidx.navigation:navigation-compose:2.6.0")
|
implementation("androidx.navigation:navigation-compose:2.7.0")
|
||||||
|
|
||||||
implementation("com.squareup.okhttp3:okhttp:4.10.0")
|
implementation("com.squareup.okhttp3:okhttp:4.10.0")
|
||||||
implementation("org.osmdroid:osmdroid-android:6.1.16")
|
implementation("org.osmdroid:osmdroid-android:6.1.16")
|
||||||
debugImplementation("androidx.compose.ui:ui-tooling:1.4.3")
|
debugImplementation("androidx.compose.ui:ui-tooling:1.5.0")
|
||||||
debugImplementation("androidx.compose.ui:ui-test-manifest:1.4.3")
|
debugImplementation("androidx.compose.ui:ui-test-manifest:1.5.0")
|
||||||
debugImplementation("com.squareup.leakcanary:leakcanary-android:2.12")
|
debugImplementation("com.squareup.leakcanary:leakcanary-android:2.12")
|
||||||
|
|
||||||
testImplementation("junit:junit:4.13.2")
|
testImplementation("junit:junit:4.13.2")
|
||||||
testImplementation("io.mockk:mockk:1.13.5")
|
testImplementation("io.mockk:mockk:1.13.5")
|
||||||
testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.3")
|
testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.3")
|
||||||
androidTestImplementation("androidx.compose.ui:ui-test-junit4:1.4.3")
|
androidTestImplementation("androidx.compose.ui:ui-test-junit4:1.5.0")
|
||||||
}
|
}
|
||||||
@@ -7,15 +7,10 @@
|
|||||||
|
|
||||||
<application
|
<application
|
||||||
android:name=".MainApplication"
|
android:name=".MainApplication"
|
||||||
android:allowBackup="false"
|
|
||||||
android:dataExtractionRules="@xml/data_extraction_rules"
|
|
||||||
android:enableOnBackInvokedCallback="true"
|
android:enableOnBackInvokedCallback="true"
|
||||||
android:fullBackupContent="@xml/backup_rules"
|
|
||||||
android:icon="@mipmap/ic_launcher"
|
android:icon="@mipmap/ic_launcher"
|
||||||
android:label="@string/app_name"
|
android:label="@string/app_name"
|
||||||
android:networkSecurityConfig="@xml/network_security_config"
|
|
||||||
android:roundIcon="@mipmap/ic_launcher_round"
|
android:roundIcon="@mipmap/ic_launcher_round"
|
||||||
android:supportsRtl="true"
|
|
||||||
android:theme="@style/Theme.Look4Sat.Main"
|
android:theme="@style/Theme.Look4Sat.Main"
|
||||||
tools:targetApi="33">
|
tools:targetApi="33">
|
||||||
|
|
||||||
|
|||||||
@@ -1,13 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?><!--
|
|
||||||
Sample backup rules file; uncomment and customize as necessary.
|
|
||||||
See https://developer.android.com/guide/topics/data/autobackup
|
|
||||||
for details.
|
|
||||||
Note: This file is ignored for devices older that API 31
|
|
||||||
See https://developer.android.com/about/versions/12/backup-restore
|
|
||||||
-->
|
|
||||||
<full-backup-content>
|
|
||||||
<!--
|
|
||||||
<include domain="sharedpref" path="."/>
|
|
||||||
<exclude domain="sharedpref" path="device.xml"/>
|
|
||||||
-->
|
|
||||||
</full-backup-content>
|
|
||||||
@@ -1,19 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?><!--
|
|
||||||
Sample data extraction rules file; uncomment and customize as necessary.
|
|
||||||
See https://developer.android.com/about/versions/12/backup-restore#xml-changes
|
|
||||||
for details.
|
|
||||||
-->
|
|
||||||
<data-extraction-rules>
|
|
||||||
<cloud-backup>
|
|
||||||
<!--
|
|
||||||
<include .../>
|
|
||||||
<exclude .../>
|
|
||||||
-->
|
|
||||||
</cloud-backup>
|
|
||||||
<!--
|
|
||||||
<device-transfer>
|
|
||||||
<include .../>
|
|
||||||
<exclude .../>
|
|
||||||
</device-transfer>
|
|
||||||
-->
|
|
||||||
</data-extraction-rules>
|
|
||||||
@@ -1,8 +0,0 @@
|
|||||||
<network-security-config>
|
|
||||||
<debug-overrides>
|
|
||||||
<trust-anchors>
|
|
||||||
<!-- Trust user added CAs while debuggable only -->
|
|
||||||
<certificates src="user" />
|
|
||||||
</trust-anchors>
|
|
||||||
</debug-overrides>
|
|
||||||
</network-security-config>
|
|
||||||
+2
-2
@@ -1,11 +1,11 @@
|
|||||||
plugins {
|
plugins {
|
||||||
id("com.android.application") version "8.1.0" apply false
|
id("com.android.application") version "8.1.0" apply false
|
||||||
id("com.android.library") version "7.1.2" apply false
|
id("com.android.library") version "8.1.0" apply false
|
||||||
id("com.google.devtools.ksp") version "1.9.0-1.0.13" apply false
|
id("com.google.devtools.ksp") version "1.9.0-1.0.13" apply false
|
||||||
id("org.jetbrains.kotlin.android") version "1.9.0" apply false
|
id("org.jetbrains.kotlin.android") version "1.9.0" apply false
|
||||||
id("org.jetbrains.kotlin.jvm") version "1.9.0" apply false
|
id("org.jetbrains.kotlin.jvm") version "1.9.0" apply false
|
||||||
}
|
}
|
||||||
|
|
||||||
tasks.register("clean", Delete::class.java) {
|
tasks.register("clean", Delete::class.java) {
|
||||||
delete(rootProject.buildDir)
|
delete(rootProject.layout.buildDirectory)
|
||||||
}
|
}
|
||||||
@@ -10,7 +10,7 @@ kotlin {
|
|||||||
|
|
||||||
android {
|
android {
|
||||||
namespace = "com.rtbishop.look4sat.data"
|
namespace = "com.rtbishop.look4sat.data"
|
||||||
compileSdk = 33
|
compileSdk = 34
|
||||||
defaultConfig {
|
defaultConfig {
|
||||||
minSdk = 21
|
minSdk = 21
|
||||||
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
|
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
|
||||||
|
|||||||
+3
-1
@@ -1,9 +1,11 @@
|
|||||||
|
android.enableJetifier=false
|
||||||
android.enableR8.fullMode=true
|
android.enableR8.fullMode=true
|
||||||
android.nonFinalResIds=true
|
android.nonFinalResIds=true
|
||||||
android.nonTransitiveRClass=true
|
android.nonTransitiveRClass=true
|
||||||
|
android.suppressUnsupportedCompileSdk=34
|
||||||
android.useAndroidX=true
|
android.useAndroidX=true
|
||||||
kotlin.code.style=official
|
kotlin.code.style=official
|
||||||
kotlin.daemon.jvm.options=-Xmx4096M
|
kotlin.daemon.jvm.options=-Xmx4g
|
||||||
kotlin.incremental=true
|
kotlin.incremental=true
|
||||||
org.gradle.caching=true
|
org.gradle.caching=true
|
||||||
org.gradle.configuration-cache=true
|
org.gradle.configuration-cache=true
|
||||||
|
|||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
#Sat Jul 29 12:58:49 BST 2023
|
#Sat Aug 12 17:56:04 BST 2023
|
||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
|
||||||
|
|||||||
Reference in new issue
Block a user