From fb767a4af406eccf3d31381978a77af3d3a93a2d Mon Sep 17 00:00:00 2001 From: Jens Klingenberg Date: Wed, 12 Jul 2023 21:55:48 +0200 Subject: [PATCH] Downgrade Gradle because of compile issues --- gradle/wrapper/gradle-wrapper.properties | 2 +- ktorfit-annotations/build.gradle.kts | 1 + ktorfit-annotations/src/androidMain/AndroidManifest.xml | 2 +- ktorfit-lib-common/build.gradle.kts | 1 + ktorfit-lib-common/src/androidMain/AndroidManifest.xml | 2 +- ktorfit-lib/build.gradle.kts | 1 + ktorfit-lib/src/androidMain/AndroidManifest.xml | 2 +- 7 files changed, 7 insertions(+), 4 deletions(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 0c85a1f75..508322917 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/ktorfit-annotations/build.gradle.kts b/ktorfit-annotations/build.gradle.kts index eed596263..b315cb980 100644 --- a/ktorfit-annotations/build.gradle.kts +++ b/ktorfit-annotations/build.gradle.kts @@ -92,6 +92,7 @@ android { minSdk = 21 targetSdk = 33 } + namespace = "de.jensklingenberg.ktorfit.annotations" } val enableSigning = project.hasProperty("ORG_GRADLE_PROJECT_signingInMemoryKey") diff --git a/ktorfit-annotations/src/androidMain/AndroidManifest.xml b/ktorfit-annotations/src/androidMain/AndroidManifest.xml index 8d94c04c3..568741e54 100644 --- a/ktorfit-annotations/src/androidMain/AndroidManifest.xml +++ b/ktorfit-annotations/src/androidMain/AndroidManifest.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/ktorfit-lib-common/build.gradle.kts b/ktorfit-lib-common/build.gradle.kts index 11bddda0d..a11a747af 100644 --- a/ktorfit-lib-common/build.gradle.kts +++ b/ktorfit-lib-common/build.gradle.kts @@ -172,6 +172,7 @@ android { minSdk = 21 targetSdk = 33 } + namespace = "de.jensklingenberg.ktorfit.common" } diff --git a/ktorfit-lib-common/src/androidMain/AndroidManifest.xml b/ktorfit-lib-common/src/androidMain/AndroidManifest.xml index d6ee0d1d7..568741e54 100644 --- a/ktorfit-lib-common/src/androidMain/AndroidManifest.xml +++ b/ktorfit-lib-common/src/androidMain/AndroidManifest.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/ktorfit-lib/build.gradle.kts b/ktorfit-lib/build.gradle.kts index 1412c3c59..4ab312d9c 100644 --- a/ktorfit-lib/build.gradle.kts +++ b/ktorfit-lib/build.gradle.kts @@ -134,6 +134,7 @@ android { minSdk = 21 targetSdk = 33 } + namespace = "de.jensklingenberg.ktorfit" } diff --git a/ktorfit-lib/src/androidMain/AndroidManifest.xml b/ktorfit-lib/src/androidMain/AndroidManifest.xml index f158a29fa..568741e54 100644 --- a/ktorfit-lib/src/androidMain/AndroidManifest.xml +++ b/ktorfit-lib/src/androidMain/AndroidManifest.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file