Upgrade to Gradle 8
This commit is contained in:
parent
8fa681a0ac
commit
8bca768197
@ -3,6 +3,7 @@ plugins {
|
|||||||
kotlin("plugin.serialization") version libs.versions.kotlin apply false
|
kotlin("plugin.serialization") version libs.versions.kotlin apply false
|
||||||
id("org.jetbrains.kotlin.android") version libs.versions.kotlin apply false
|
id("org.jetbrains.kotlin.android") version libs.versions.kotlin 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("com.google.protobuf") version "0.9.4" apply false
|
||||||
}
|
}
|
||||||
|
|
||||||
buildscript {
|
buildscript {
|
||||||
@ -11,7 +12,7 @@ buildscript {
|
|||||||
mavenCentral()
|
mavenCentral()
|
||||||
}
|
}
|
||||||
dependencies {
|
dependencies {
|
||||||
classpath("com.android.tools.build:gradle:7.3.1")
|
classpath("com.android.tools.build:gradle:8.1.0")
|
||||||
classpath(libs.kotlin.gradle)
|
classpath(libs.kotlin.gradle)
|
||||||
// NOTE: Do not place your application dependencies here; they belong
|
// NOTE: Do not place your application dependencies here; they belong
|
||||||
// in the individual module build.gradle files
|
// in the individual module build.gradle files
|
||||||
|
|||||||
@ -3,7 +3,7 @@ import com.google.protobuf.gradle.*
|
|||||||
plugins {
|
plugins {
|
||||||
id("com.android.library")
|
id("com.android.library")
|
||||||
id("kotlin-android")
|
id("kotlin-android")
|
||||||
id("com.google.protobuf").version("0.8.14")
|
id("com.google.protobuf")
|
||||||
}
|
}
|
||||||
|
|
||||||
android {
|
android {
|
||||||
|
|||||||
@ -18,4 +18,7 @@ android.injected.testOnly=false
|
|||||||
org.gradle.daemon=true
|
org.gradle.daemon=true
|
||||||
org.gradle.parallel=true
|
org.gradle.parallel=true
|
||||||
org.gradle.caching=true
|
org.gradle.caching=true
|
||||||
org.gradle.unsafe.configuration-cache=true
|
android.enableR8.fullMode=false
|
||||||
|
android.defaults.buildfeatures.buildconfig=true
|
||||||
|
android.nonTransitiveRClass=false
|
||||||
|
android.nonFinalResIds=false
|
||||||
2
gradle/wrapper/gradle-wrapper.properties
vendored
2
gradle/wrapper/gradle-wrapper.properties
vendored
@ -1,6 +1,6 @@
|
|||||||
#Mon Dec 12 19:53:45 CET 2022
|
#Mon Dec 12 19:53:45 CET 2022
|
||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
zipStorePath=wrapper/dists
|
zipStorePath=wrapper/dists
|
||||||
|
|||||||
@ -0,0 +1,29 @@
|
|||||||
|
-keep class org.apache.** { *; }
|
||||||
|
-dontwarn edu.umd.cs.findbugs.annotations.Nullable
|
||||||
|
-dontwarn java.lang.reflect.AnnotatedType
|
||||||
|
-dontwarn javax.lang.model.element.Modifier
|
||||||
|
-dontwarn javax.script.ScriptEngine
|
||||||
|
-dontwarn javax.script.ScriptEngineManager
|
||||||
|
-dontwarn org.apache.http.client.config.RequestConfig$Builder
|
||||||
|
-dontwarn org.apache.http.client.config.RequestConfig
|
||||||
|
-dontwarn org.apache.http.client.methods.HttpPatch
|
||||||
|
-dontwarn org.apache.http.conn.DnsResolver
|
||||||
|
-dontwarn org.apache.http.conn.HttpClientConnectionManager
|
||||||
|
-dontwarn org.apache.http.conn.HttpConnectionFactory
|
||||||
|
-dontwarn org.apache.http.conn.SchemePortResolver
|
||||||
|
-dontwarn org.apache.http.conn.socket.LayeredConnectionSocketFactory
|
||||||
|
-dontwarn org.apache.http.conn.socket.PlainConnectionSocketFactory
|
||||||
|
-dontwarn org.apache.http.conn.ssl.SSLConnectionSocketFactory
|
||||||
|
-dontwarn org.apache.http.impl.client.CloseableHttpClient
|
||||||
|
-dontwarn org.apache.http.impl.client.HttpClientBuilder
|
||||||
|
-dontwarn org.apache.http.impl.conn.PoolingHttpClientConnectionManager
|
||||||
|
-dontwarn org.apache.http.impl.conn.SystemDefaultRoutePlanner
|
||||||
|
-dontwarn org.bouncycastle.jsse.BCSSLParameters
|
||||||
|
-dontwarn org.bouncycastle.jsse.BCSSLSocket
|
||||||
|
-dontwarn org.bouncycastle.jsse.provider.BouncyCastleJsseProvider
|
||||||
|
-dontwarn org.conscrypt.Conscrypt$Version
|
||||||
|
-dontwarn org.conscrypt.Conscrypt
|
||||||
|
-dontwarn org.conscrypt.ConscryptHostnameVerifier
|
||||||
|
-dontwarn org.openjsse.javax.net.ssl.SSLParameters
|
||||||
|
-dontwarn org.openjsse.javax.net.ssl.SSLSocket
|
||||||
|
-dontwarn org.openjsse.net.ssl.OpenJSSE
|
||||||
@ -1,6 +1,3 @@
|
|||||||
enableFeaturePreview("VERSION_CATALOGS")
|
|
||||||
|
|
||||||
|
|
||||||
dependencyResolutionManagement {
|
dependencyResolutionManagement {
|
||||||
versionCatalogs {
|
versionCatalogs {
|
||||||
create("sdk") {
|
create("sdk") {
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user