From d0945daa995b9473cb4dddab82b7f76a74ad461c Mon Sep 17 00:00:00 2001 From: Chingiz Date: Thu, 6 Jul 2023 16:32:34 +0600 Subject: [PATCH 1/2] NO-TICKET - Gradle updates --- app/build.gradle.kts | 4 ++-- build.gradle.kts | 2 +- buildSrc/build.gradle.kts | 6 +++--- buildSrc/src/main/java/Versions.kt | 1 - .../kotlin/org/p2p/wallet/android/application.gradle.kts | 8 +++++--- .../main/kotlin/org/p2p/wallet/android/library.gradle.kts | 6 +++--- core/build.gradle.kts | 2 +- core/src/main/AndroidManifest.xml | 2 +- ethereumkit/build.gradle.kts | 4 ++++ ethereumkit/src/main/AndroidManifest.xml | 3 +-- gradle/wrapper/gradle-wrapper.properties | 2 +- solana/build.gradle.kts | 4 ++++ solana/src/main/AndroidManifest.xml | 4 +--- ui-kit/build.gradle.kts | 4 ++++ ui-kit/src/main/AndroidManifest.xml | 2 +- 15 files changed, 32 insertions(+), 22 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 830b32b41f..11bb7ad41b 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -6,7 +6,7 @@ plugins { id("org.p2p.wallet.android.application") id("com.google.gms.google-services") id("com.google.firebase.crashlytics") - id("io.sentry.android.gradle") version "3.2.0" + id("io.sentry.android.gradle") version "3.11.0" id("org.jetbrains.kotlinx.kover") version "0.7.0" } @@ -87,7 +87,7 @@ android { tasks.withType().configureEach { kotlinOptions { - jvmTarget = "11" + jvmTarget = "17" } } } diff --git a/build.gradle.kts b/build.gradle.kts index 7465c67cdc..388a1e3004 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -13,7 +13,7 @@ buildscript { dependencies { classpath("com.android.tools.build:gradle:${Versions.buildGradleVersion}") - classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${Versions.kotlinGradlePluginVersion}") + classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${Versions.kotlinVersion}") classpath("com.google.firebase:firebase-crashlytics-gradle:2.9.6") classpath("com.google.gms:google-services:4.3.15") } diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index e6974d09f6..bafd487a06 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -19,13 +19,13 @@ tasks.test { tasks.withType().configureEach { kotlinOptions { - jvmTarget = "11" + jvmTarget = "17" } } dependencies { implementation(gradleApi()) - implementation("com.android.tools.build:gradle:7.3.1") + implementation("com.android.tools.build:gradle:8.0.2") implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.10") - implementation("com.google.firebase:firebase-appdistribution-gradle:3.2.0") + implementation("com.google.firebase:firebase-appdistribution-gradle:4.0.0") } diff --git a/buildSrc/src/main/java/Versions.kt b/buildSrc/src/main/java/Versions.kt index 5638a4a942..82f0a8cae0 100644 --- a/buildSrc/src/main/java/Versions.kt +++ b/buildSrc/src/main/java/Versions.kt @@ -26,6 +26,5 @@ object Versions { } const val kotlinVersion = "1.8.10" - const val kotlinGradlePluginVersion = "1.8.10" const val buildGradleVersion = "8.0.2" } diff --git a/buildSrc/src/main/kotlin/org/p2p/wallet/android/application.gradle.kts b/buildSrc/src/main/kotlin/org/p2p/wallet/android/application.gradle.kts index 8f326990e1..827239df47 100644 --- a/buildSrc/src/main/kotlin/org/p2p/wallet/android/application.gradle.kts +++ b/buildSrc/src/main/kotlin/org/p2p/wallet/android/application.gradle.kts @@ -22,6 +22,7 @@ apply { android { compileSdk = Versions.sdkCompileVersion + namespace = "org.p2p.wallet" defaultConfig { applicationId = "org.p2p.wallet" @@ -82,12 +83,12 @@ android { } compileOptions { - sourceCompatibility = JavaVersion.VERSION_11 - targetCompatibility = JavaVersion.VERSION_11 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } kotlinOptions { - jvmTarget = JavaVersion.VERSION_11.toString() + jvmTarget = JavaVersion.VERSION_17.toString() } applicationVariants.all { @@ -100,5 +101,6 @@ android { buildFeatures { viewBinding = true + buildConfig = true } } diff --git a/buildSrc/src/main/kotlin/org/p2p/wallet/android/library.gradle.kts b/buildSrc/src/main/kotlin/org/p2p/wallet/android/library.gradle.kts index 7e3700ea36..74b22e92dc 100644 --- a/buildSrc/src/main/kotlin/org/p2p/wallet/android/library.gradle.kts +++ b/buildSrc/src/main/kotlin/org/p2p/wallet/android/library.gradle.kts @@ -36,12 +36,12 @@ android { } compileOptions { - sourceCompatibility = JavaVersion.VERSION_11 - targetCompatibility = JavaVersion.VERSION_11 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } kotlinOptions { - jvmTarget = JavaVersion.VERSION_11.toString() + jvmTarget = JavaVersion.VERSION_17.toString() } buildFeatures { diff --git a/core/build.gradle.kts b/core/build.gradle.kts index 09b126c844..29594eb5c4 100644 --- a/core/build.gradle.kts +++ b/core/build.gradle.kts @@ -8,7 +8,7 @@ apply { } android { - buildFeatures.buildConfig = true + namespace = "org.p2p.core" } dependencies { diff --git a/core/src/main/AndroidManifest.xml b/core/src/main/AndroidManifest.xml index b4cccc83bc..f0f34af319 100644 --- a/core/src/main/AndroidManifest.xml +++ b/core/src/main/AndroidManifest.xml @@ -1,4 +1,4 @@ - + \ No newline at end of file diff --git a/ethereumkit/build.gradle.kts b/ethereumkit/build.gradle.kts index 03348c425f..c098178ae8 100644 --- a/ethereumkit/build.gradle.kts +++ b/ethereumkit/build.gradle.kts @@ -2,6 +2,10 @@ plugins { id("org.p2p.wallet.android.library") } +android { + namespace = "org.p2p.ethereumkit" +} + dependencies { implementation(project(":core")) implementation("org.bouncycastle:bcpkix-jdk15on:1.68") diff --git a/ethereumkit/src/main/AndroidManifest.xml b/ethereumkit/src/main/AndroidManifest.xml index b6052306a3..3610520668 100644 --- a/ethereumkit/src/main/AndroidManifest.xml +++ b/ethereumkit/src/main/AndroidManifest.xml @@ -1,5 +1,4 @@ - + diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 2bea62ee9c..b740d19a4a 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Thu Feb 16 01:46:39 GMT+06:00 2023 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --git a/solana/build.gradle.kts b/solana/build.gradle.kts index 65248779f1..b0d7a20529 100644 --- a/solana/build.gradle.kts +++ b/solana/build.gradle.kts @@ -2,6 +2,10 @@ plugins { id("org.p2p.wallet.android.library") } +android { + namespace = "org.p2p.solana" +} + dependencies { Dependencies.baseAndroidLibraries.forEach { implementation(it) } diff --git a/solana/src/main/AndroidManifest.xml b/solana/src/main/AndroidManifest.xml index 72bf3a1fc1..568741e54f 100644 --- a/solana/src/main/AndroidManifest.xml +++ b/solana/src/main/AndroidManifest.xml @@ -1,4 +1,2 @@ - - - \ No newline at end of file + \ No newline at end of file diff --git a/ui-kit/build.gradle.kts b/ui-kit/build.gradle.kts index 2b5f953081..d82eae4d96 100644 --- a/ui-kit/build.gradle.kts +++ b/ui-kit/build.gradle.kts @@ -2,6 +2,10 @@ plugins { id("org.p2p.wallet.android.library") } +android { + namespace = "org.p2p.uikit" +} + dependencies { Dependencies.baseAndroidLibraries.forEach { implementation(it) } Dependencies.adapterDelegatesLibraries.forEach { implementation(it) } diff --git a/ui-kit/src/main/AndroidManifest.xml b/ui-kit/src/main/AndroidManifest.xml index b3384ec3d5..568741e54f 100644 --- a/ui-kit/src/main/AndroidManifest.xml +++ b/ui-kit/src/main/AndroidManifest.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file From 038475403c347ac6101ddd570ff43914cb61f173 Mon Sep 17 00:00:00 2001 From: Chingiz Date: Thu, 6 Jul 2023 16:33:25 +0600 Subject: [PATCH 2/2] NO-TICKET - Reverted namespace --- .../src/main/kotlin/org/p2p/wallet/android/library.gradle.kts | 4 ++++ core/build.gradle.kts | 4 ---- ethereumkit/build.gradle.kts | 4 ---- solana/build.gradle.kts | 4 ---- ui-kit/build.gradle.kts | 4 ---- 5 files changed, 4 insertions(+), 16 deletions(-) diff --git a/buildSrc/src/main/kotlin/org/p2p/wallet/android/library.gradle.kts b/buildSrc/src/main/kotlin/org/p2p/wallet/android/library.gradle.kts index 74b22e92dc..640f807829 100644 --- a/buildSrc/src/main/kotlin/org/p2p/wallet/android/library.gradle.kts +++ b/buildSrc/src/main/kotlin/org/p2p/wallet/android/library.gradle.kts @@ -9,6 +9,10 @@ plugins { kotlin("android") } +android { + namespace = "org.p2p.wallet" +} + android { compileSdk = Versions.sdkCompileVersion diff --git a/core/build.gradle.kts b/core/build.gradle.kts index 29594eb5c4..dcb8b3da79 100644 --- a/core/build.gradle.kts +++ b/core/build.gradle.kts @@ -7,10 +7,6 @@ apply { from("${project.rootDir}/.scripts/config.gradle") } -android { - namespace = "org.p2p.core" -} - dependencies { Dependencies.baseAndroidLibraries.forEach { implementation(it) } diff --git a/ethereumkit/build.gradle.kts b/ethereumkit/build.gradle.kts index c098178ae8..03348c425f 100644 --- a/ethereumkit/build.gradle.kts +++ b/ethereumkit/build.gradle.kts @@ -2,10 +2,6 @@ plugins { id("org.p2p.wallet.android.library") } -android { - namespace = "org.p2p.ethereumkit" -} - dependencies { implementation(project(":core")) implementation("org.bouncycastle:bcpkix-jdk15on:1.68") diff --git a/solana/build.gradle.kts b/solana/build.gradle.kts index b0d7a20529..65248779f1 100644 --- a/solana/build.gradle.kts +++ b/solana/build.gradle.kts @@ -2,10 +2,6 @@ plugins { id("org.p2p.wallet.android.library") } -android { - namespace = "org.p2p.solana" -} - dependencies { Dependencies.baseAndroidLibraries.forEach { implementation(it) } diff --git a/ui-kit/build.gradle.kts b/ui-kit/build.gradle.kts index d82eae4d96..2b5f953081 100644 --- a/ui-kit/build.gradle.kts +++ b/ui-kit/build.gradle.kts @@ -2,10 +2,6 @@ plugins { id("org.p2p.wallet.android.library") } -android { - namespace = "org.p2p.uikit" -} - dependencies { Dependencies.baseAndroidLibraries.forEach { implementation(it) } Dependencies.adapterDelegatesLibraries.forEach { implementation(it) }