dependency update
This commit is contained in:
2
.idea/gradle.xml
generated
2
.idea/gradle.xml
generated
@@ -4,7 +4,7 @@
|
|||||||
<component name="GradleSettings">
|
<component name="GradleSettings">
|
||||||
<option name="linkedExternalProjectsSettings">
|
<option name="linkedExternalProjectsSettings">
|
||||||
<GradleProjectSettings>
|
<GradleProjectSettings>
|
||||||
<option name="testRunner" value="PLATFORM" />
|
<option name="testRunner" value="GRADLE" />
|
||||||
<option name="distributionType" value="DEFAULT_WRAPPED" />
|
<option name="distributionType" value="DEFAULT_WRAPPED" />
|
||||||
<option name="externalProjectPath" value="$PROJECT_DIR$" />
|
<option name="externalProjectPath" value="$PROJECT_DIR$" />
|
||||||
<option name="modules">
|
<option name="modules">
|
||||||
|
|||||||
10
.idea/runConfigurations.xml
generated
10
.idea/runConfigurations.xml
generated
@@ -1,10 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<project version="4">
|
|
||||||
<component name="RunConfigurationProducerService">
|
|
||||||
<option name="ignoredProducers">
|
|
||||||
<set>
|
|
||||||
<option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
|
|
||||||
</set>
|
|
||||||
</option>
|
|
||||||
</component>
|
|
||||||
</project>
|
|
||||||
@@ -17,11 +17,11 @@ plugins {
|
|||||||
}
|
}
|
||||||
|
|
||||||
android {
|
android {
|
||||||
compileSdkVersion(30)
|
compileSdk = 30
|
||||||
defaultConfig {
|
defaultConfig {
|
||||||
applicationId = "xyz.quaver.pupil"
|
applicationId = "xyz.quaver.pupil"
|
||||||
minSdkVersion(21)
|
minSdk = 21
|
||||||
targetSdkVersion(30)
|
targetSdk = 30
|
||||||
versionCode = 600
|
versionCode = 600
|
||||||
versionName = "6.0.0-alpha2"
|
versionName = "6.0.0-alpha2"
|
||||||
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
|
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
|
||||||
@@ -47,10 +47,11 @@ android {
|
|||||||
buildFeatures {
|
buildFeatures {
|
||||||
viewBinding = true
|
viewBinding = true
|
||||||
dataBinding = true
|
dataBinding = true
|
||||||
|
compose = true
|
||||||
}
|
}
|
||||||
kotlinOptions {
|
kotlinOptions {
|
||||||
jvmTarget = JavaVersion.VERSION_1_8.toString()
|
jvmTarget = JavaVersion.VERSION_1_8.toString()
|
||||||
freeCompilerArgs += "-Xuse-experimental=kotlin.Experimental"
|
freeCompilerArgs = listOf("-Xuse-experimental=kotlin.Experimental")
|
||||||
}
|
}
|
||||||
compileOptions {
|
compileOptions {
|
||||||
sourceCompatibility = JavaVersion.VERSION_1_8
|
sourceCompatibility = JavaVersion.VERSION_1_8
|
||||||
@@ -64,11 +65,19 @@ dependencies {
|
|||||||
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.0")
|
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.0")
|
||||||
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.2.1")
|
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.2.1")
|
||||||
|
|
||||||
|
implementation("androidx.compose.ui:ui:1.0.0-rc02")
|
||||||
|
implementation("androidx.compose.ui:ui-tooling:1.0.0-rc02")
|
||||||
|
implementation("androidx.compose.foundation:foundation:1.0.0-rc02")
|
||||||
|
implementation("androidx.compose.material:material:1.0.0-rc02")
|
||||||
|
implementation("androidx.compose.material:material-icons-core:1.0.0-rc02")
|
||||||
|
implementation("androidx.compose.material:material-icons-extended:1.0.0-rc02")
|
||||||
|
implementation("androidx.compose.runtime:runtime-livedata:1.0.0-rc02")
|
||||||
|
|
||||||
implementation("io.ktor:ktor-client-core:1.6.1")
|
implementation("io.ktor:ktor-client-core:1.6.1")
|
||||||
implementation("io.ktor:ktor-client-okhttp:1.6.1")
|
implementation("io.ktor:ktor-client-okhttp:1.6.1")
|
||||||
implementation("io.ktor:ktor-client-serialization:1.6.1")
|
implementation("io.ktor:ktor-client-serialization:1.6.1")
|
||||||
|
|
||||||
implementation("androidx.appcompat:appcompat:1.3.0")
|
implementation("androidx.appcompat:appcompat:1.3.1")
|
||||||
implementation("androidx.activity:activity-ktx:1.3.0-rc02")
|
implementation("androidx.activity:activity-ktx:1.3.0-rc02")
|
||||||
implementation("androidx.fragment:fragment-ktx:1.3.6")
|
implementation("androidx.fragment:fragment-ktx:1.3.6")
|
||||||
implementation("androidx.preference:preference-ktx:1.1.1")
|
implementation("androidx.preference:preference-ktx:1.1.1")
|
||||||
@@ -122,4 +131,6 @@ dependencies {
|
|||||||
androidTestImplementation("androidx.test:rules:1.4.0")
|
androidTestImplementation("androidx.test:rules:1.4.0")
|
||||||
androidTestImplementation("androidx.test:runner:1.4.0")
|
androidTestImplementation("androidx.test:runner:1.4.0")
|
||||||
androidTestImplementation("androidx.test.espresso:espresso-core:3.4.0")
|
androidTestImplementation("androidx.test.espresso:espresso-core:3.4.0")
|
||||||
|
|
||||||
|
androidTestImplementation("androidx.compose.ui:ui-test-junit4:1.0.0-rc02")
|
||||||
}
|
}
|
||||||
@@ -6,7 +6,7 @@ buildscript {
|
|||||||
mavenCentral()
|
mavenCentral()
|
||||||
}
|
}
|
||||||
dependencies {
|
dependencies {
|
||||||
classpath("com.android.tools.build:gradle:4.2.2")
|
classpath("com.android.tools.build:gradle:7.0.0-rc01")
|
||||||
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.21")
|
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.21")
|
||||||
classpath("org.jetbrains.kotlin:kotlin-android-extensions:1.5.21")
|
classpath("org.jetbrains.kotlin:kotlin-android-extensions:1.5.21")
|
||||||
classpath("org.jetbrains.kotlin:kotlin-serialization:1.5.21")
|
classpath("org.jetbrains.kotlin:kotlin-serialization:1.5.21")
|
||||||
|
|||||||
Reference in New Issue
Block a user