Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

NO-TICKET - Gradle update #1935

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

NO-TICKET - Gradle update #1935

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d0945da
NO-TICKET - Gradle updates
1sakov Jul 6, 2023
0384754
NO-TICKET - Reverted namespace
1sakov Jul 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}

Expand Down Expand Up @@ -87,7 +87,7 @@ android {

tasks.withType<KotlinCompile>().configureEach {
kotlinOptions {
jvmTarget = "11"
jvmTarget = "17"
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
Expand Down
6 changes: 3 additions & 3 deletions buildSrc/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
1 change: 0 additions & 1 deletion buildSrc/src/main/java/Versions.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,5 @@ object Versions {
}

const val kotlinVersion = "1.8.10"
const val kotlinGradlePluginVersion = "1.8.10"
const val buildGradleVersion = "8.0.2"
}
8 changes: 5 additions & 3 deletions buildSrc/src/main/kotlin/org/p2p/wallet/android/application.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ apply {

android {
compileSdk = Versions.sdkCompileVersion
namespace = "org.p2p.wallet"

defaultConfig {
applicationId = "org.p2p.wallet"
Expand Down Expand Up @@ -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 {
Expand All @@ -100,5 +101,6 @@ android {

buildFeatures {
viewBinding = true
buildConfig = true
}
}
10 changes: 7 additions & 3 deletions buildSrc/src/main/kotlin/org/p2p/wallet/android/library.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@ plugins {
kotlin("android")
}

android {
namespace = "org.p2p.wallet"
}

android {
compileSdk = Versions.sdkCompileVersion

Expand Down Expand Up @@ -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 {
Expand Down
4 changes: 0 additions & 4 deletions core/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,6 @@ apply {
from("${project.rootDir}/.scripts/config.gradle")
}

android {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if we remove this, we can't use BuildConfig file in application

buildFeatures.buildConfig = true
}

dependencies {
Dependencies.baseAndroidLibraries.forEach { implementation(it) }

Expand Down
2 changes: 1 addition & 1 deletion core/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
3 changes: 1 addition & 2 deletions ethereumkit/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
4 changes: 1 addition & 3 deletions solana/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest package="org.p2p.solana">

</manifest>
<manifest />
2 changes: 1 addition & 1 deletion ui-kit/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest package="org.p2p.uikit" />
<manifest />