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<KotlinCompile>().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<KotlinCompile>().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..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
@@ -36,12 +40,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..dcb8b3da79 100644
--- a/core/build.gradle.kts
+++ b/core/build.gradle.kts
@@ -7,10 +7,6 @@ apply {
from("${project.rootDir}/.scripts/config.gradle")
}
-android {
- buildFeatures.buildConfig = true
-}
-
dependencies {
Dependencies.baseAndroidLibraries.forEach { implementation(it) }
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 @@
<?xml version="1.0" encoding="utf-8"?>
-<manifest package="org.p2p.core" xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
</manifest>
\ No newline at end of file
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 @@
-<manifest package="org.p2p.ethereumkit"
- xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
</manifest>
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/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 @@
<?xml version="1.0" encoding="utf-8"?>
-<manifest package="org.p2p.solana">
-
-</manifest>
\ No newline at end of file
+<manifest />
\ No newline at end of file
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 @@
<?xml version="1.0" encoding="utf-8"?>
-<manifest package="org.p2p.uikit" />
\ No newline at end of file
+<manifest />
\ No newline at end of file