Target Android 12L

This commit is contained in:
Mygod
2022-02-21 12:13:01 -05:00
parent b81633b1e7
commit ba0c62a0cf
3 changed files with 18 additions and 18 deletions

View File

@@ -1,5 +1,5 @@
plugins { plugins {
id("com.github.ben-manes.versions") version "0.39.0" id("com.github.ben-manes.versions") version "0.42.0"
} }
buildscript { buildscript {
@@ -9,8 +9,8 @@ buildscript {
} }
dependencies { dependencies {
classpath(kotlin("gradle-plugin", "1.6.0")) classpath(kotlin("gradle-plugin", "1.6.10"))
classpath("com.android.tools.build:gradle:7.1.0-beta04") classpath("com.android.tools.build:gradle:7.1.1")
classpath("com.google.firebase:firebase-crashlytics-gradle:2.8.1") classpath("com.google.firebase:firebase-crashlytics-gradle:2.8.1")
classpath("com.google.android.gms:oss-licenses-plugin:0.10.4") classpath("com.google.android.gms:oss-licenses-plugin:0.10.4")
classpath("com.google.gms:google-services:4.3.10") classpath("com.google.gms:google-services:4.3.10")

View File

@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

View File

@@ -10,13 +10,13 @@ plugins {
android { android {
val javaVersion = JavaVersion.VERSION_11 val javaVersion = JavaVersion.VERSION_11
buildToolsVersion = "31.0.0" buildToolsVersion = "32.0.0"
compileOptions { compileOptions {
isCoreLibraryDesugaringEnabled = true isCoreLibraryDesugaringEnabled = true
sourceCompatibility = javaVersion sourceCompatibility = javaVersion
targetCompatibility = javaVersion targetCompatibility = javaVersion
} }
compileSdk = 31 compileSdk = 32
kotlinOptions.jvmTarget = javaVersion.toString() kotlinOptions.jvmTarget = javaVersion.toString()
defaultConfig { defaultConfig {
applicationId = "be.mygod.vpnhotspot" applicationId = "be.mygod.vpnhotspot"
@@ -56,10 +56,10 @@ android {
} }
create("google") { create("google") {
dimension = "freedom" dimension = "freedom"
targetSdk = 31 targetSdk = 32
versionNameSuffix = "-g" versionNameSuffix = "-g"
buildConfigField("boolean", "DONATIONS", "false") buildConfigField("boolean", "DONATIONS", "false")
buildConfigField("int", "TARGET_SDK", "31") buildConfigField("int", "TARGET_SDK", "32")
} }
} }
sourceSets.getByName("androidTest").assets.srcDir("$projectDir/schemas") sourceSets.getByName("androidTest").assets.srcDir("$projectDir/schemas")
@@ -67,33 +67,33 @@ android {
dependencies { dependencies {
val lifecycleVersion = "2.4.0" val lifecycleVersion = "2.4.0"
val roomVersion = "2.4.0-rc01" val roomVersion = "2.4.1"
coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:1.1.5") coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:1.1.5")
kapt("androidx.room:room-compiler:$roomVersion") kapt("androidx.room:room-compiler:$roomVersion")
implementation(kotlin("stdlib-jdk8")) implementation(kotlin("stdlib-jdk8"))
implementation("androidx.appcompat:appcompat:1.4.0") // https://issuetracker.google.com/issues/151603528 implementation("androidx.appcompat:appcompat:1.4.1") // https://issuetracker.google.com/issues/151603528
implementation("androidx.browser:browser:1.4.0") implementation("androidx.browser:browser:1.4.0")
implementation("androidx.core:core-ktx:1.7.0") implementation("androidx.core:core-ktx:1.7.0")
implementation("androidx.fragment:fragment-ktx:1.4.0") implementation("androidx.fragment:fragment-ktx:1.4.1")
implementation("androidx.lifecycle:lifecycle-livedata-ktx:$lifecycleVersion") implementation("androidx.lifecycle:lifecycle-livedata-ktx:$lifecycleVersion")
implementation("androidx.lifecycle:lifecycle-runtime-ktx:$lifecycleVersion") implementation("androidx.lifecycle:lifecycle-runtime-ktx:$lifecycleVersion")
implementation("androidx.preference:preference:1.2.0-beta01") implementation("androidx.preference:preference:1.2.0")
implementation("androidx.room:room-ktx:$roomVersion") implementation("androidx.room:room-ktx:$roomVersion")
implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.1.0") implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.1.0")
implementation("com.android.billingclient:billing-ktx:4.0.0") implementation("com.android.billingclient:billing-ktx:4.0.0")
implementation("com.google.android.gms:play-services-oss-licenses:17.0.0") implementation("com.google.android.gms:play-services-oss-licenses:17.0.0")
implementation("com.google.android.material:material:1.5.0-beta01") implementation("com.google.android.material:material:1.5.0")
implementation("com.google.firebase:firebase-analytics-ktx:20.0.0") implementation("com.google.firebase:firebase-analytics-ktx:20.1.0")
implementation("com.google.firebase:firebase-crashlytics:18.2.5") implementation("com.google.firebase:firebase-crashlytics:18.2.8")
implementation("com.google.zxing:core:3.4.1") implementation("com.google.zxing:core:3.4.1")
implementation("com.jakewharton.timber:timber:5.0.1") implementation("com.jakewharton.timber:timber:5.0.1")
implementation("com.linkedin.dexmaker:dexmaker:2.28.1") implementation("com.linkedin.dexmaker:dexmaker:2.28.1")
implementation("com.takisoft.preferencex:preferencex-simplemenu:1.1.0") implementation("com.takisoft.preferencex:preferencex-simplemenu:1.1.0")
implementation("org.jetbrains.kotlinx:kotlinx-collections-immutable:0.3.4") implementation("org.jetbrains.kotlinx:kotlinx-collections-immutable:0.3.5")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.0-RC") implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.0")
add("googleImplementation", "com.github.tiann:FreeReflection:3.1.0") add("googleImplementation", "com.github.tiann:FreeReflection:3.1.0")
add("googleImplementation", "com.google.android.play:core:1.10.2") add("googleImplementation", "com.google.android.play:core:1.10.3")
add("googleImplementation", "com.google.android.play:core-ktx:1.8.1") add("googleImplementation", "com.google.android.play:core-ktx:1.8.1")
testImplementation("junit:junit:4.13.2") testImplementation("junit:junit:4.13.2")
androidTestImplementation("androidx.room:room-testing:$roomVersion") androidTestImplementation("androidx.room:room-testing:$roomVersion")