2FAS/2fas-android
1
0
Fork 0
mirror of https://github.com/twofas/2fas-android.git synced 2024-11-21 17:59:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade to AS Giraffe

Browse Source
This commit is contained in:
Rafał Kobyłko 2023-02-25 10:55:11 +01:00
parent 080b9176a6
commit 000b764498
5 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build.gradle.kts
View File

@ -1,7 +1,7 @@
buildscript { buildscript {
dependencies { dependencies {
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.20") classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${libs.versions.kotlin.get()}")
classpath("org.jetbrains.kotlin:kotlin-serialization:1.7.20") classpath("org.jetbrains.kotlin:kotlin-serialization:${libs.versions.kotlin.get()}")
classpath("com.google.gms:google-services:4.3.14") classpath("com.google.gms:google-services:4.3.14")
classpath("com.google.firebase:firebase-crashlytics-gradle:2.9.2") classpath("com.google.firebase:firebase-crashlytics-gradle:2.9.2")
} }

8
buildlogic/build.gradle.kts
View File

@ -10,13 +10,13 @@ repositories {
} }
java { java {
sourceCompatibility = JavaVersion.VERSION_11 sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_11 targetCompatibility = JavaVersion.VERSION_17
} }
dependencies { dependencies {
compileOnly("com.android.tools.build:gradle:8.0.0-alpha11") compileOnly("com.android.tools.build:gradle:${libs.versions.agp.get()}")
compileOnly("org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.20") compileOnly("org.jetbrains.kotlin:kotlin-gradle-plugin:${libs.versions.kotlin.get()}")
} }
gradlePlugin { gradlePlugin {

6
buildlogic/src/main/java/com/twofasapp/buildlogic/extension/KotlinAndroid.kt
View File

@ -27,8 +27,8 @@ internal fun Project.applyKotlinAndroid(
compileOptions { compileOptions {
isCoreLibraryDesugaringEnabled = true isCoreLibraryDesugaringEnabled = true
sourceCompatibility = JavaVersion.VERSION_11 sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_11 targetCompatibility = JavaVersion.VERSION_17
} }
buildFeatures { buildFeatures {
@ -37,7 +37,7 @@ internal fun Project.applyKotlinAndroid(
} }
kotlinOptions { kotlinOptions {
jvmTarget = "11" jvmTarget = "17"
freeCompilerArgs = freeCompilerArgs + listOf( freeCompilerArgs = freeCompilerArgs + listOf(
"-opt-in=kotlin.RequiresOptIn", "-opt-in=kotlin.RequiresOptIn",

10
gradle/libs.versions.toml
View File

@ -1,18 +1,18 @@
[versions] [versions]
accompanist = "0.27.0" accompanist = "0.27.0"
agp = "8.0.0-alpha11" agp = "8.1.0-alpha06"
coil = "2.2.2" coil = "2.2.2"
compose = "1.3.0" compose = "1.3.0"
composeActivity = "1.6.0" composeActivity = "1.6.1"
composeCompiler = "1.3.2" composeCompiler = "1.4.3"
core = "1.9.0" core = "1.9.0"
espresso = "3.5.0" espresso = "3.5.0"
koin = "3.2.2" koin = "3.2.2"
koinAndroid = "3.3.0" koinAndroid = "3.3.0"
kotest = "5.5.2" kotest = "5.5.2"
kotlin = "1.7.20" kotlin = "1.8.10"
kotlinCoroutines = "1.6.4" kotlinCoroutines = "1.6.4"
kotlinKsp = "1.7.20-1.0.6" kotlinKsp = "1.8.10-1.0.9"
ktlint = "3.12.0" ktlint = "3.12.0"
ktor = "2.1.2" ktor = "2.1.2"
material3 = "1.0.1" material3 = "1.0.1"

2
gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip