Skip to content

Commit 56ec45f

Browse files
committed
build: fix Gradle deprecation warnings by using url = uri(...) and namespace = '...'; add androidTest packaging excludes for META-INF conflicts in runtime
1 parent 90a4217 commit 56ec45f

File tree

25 files changed

+2715
-82
lines changed

25 files changed

+2715
-82
lines changed

app/build.gradle

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -127,8 +127,6 @@ android {
127127
}
128128

129129
kotlinOptions {
130-
freeCompilerArgs = ["-Xallow-result-return-type"]
131-
132130
jvmTarget = JavaVersion.VERSION_21.toString()
133131
}
134132
kotlin {
@@ -142,7 +140,7 @@ android {
142140
lint {
143141
disable 'Instantiatable'
144142
}
145-
namespace 'jp.co.soramitsu.app'
143+
namespace = 'jp.co.soramitsu.app'
146144

147145
packagingOptions {
148146
resources.excludes.add("META-INF/**/*")

build.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ buildscript {
1919
repositories {
2020
google()
2121
mavenCentral()
22-
maven { url "https://plugins.gradle.org/m2/" }
23-
maven { url 'https://maven.google.com' }
22+
maven { url = uri("https://plugins.gradle.org/m2/") }
23+
maven { url = uri('https://maven.google.com') }
2424
}
2525
dependencies {
2626
classpath libs.gradleplugins.android
@@ -50,14 +50,14 @@ allprojects {
5050
repositories {
5151
google()
5252
mavenLocal()
53-
maven { url "https://nexus.iroha.tech/repository/maven-soramitsu/" }
53+
maven { url = uri("https://nexus.iroha.tech/repository/maven-soramitsu/") }
5454
mavenCentral()
55-
maven { url "https://jitpack.io" }
55+
maven { url = uri("https://jitpack.io") }
5656

5757
def payRepoUrl = readSecret("PAY_WINGS_REPOSITORY_URL")
5858
if (payRepoUrl) {
5959
maven {
60-
url = payRepoUrl
60+
url = uri(payRepoUrl)
6161
credentials {
6262
username = readSecret("PAY_WINGS_USERNAME") ?: ""
6363
password = readSecret("PAY_WINGS_PASSWORD") ?: ""

common/build.gradle

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -98,11 +98,9 @@ android {
9898
}
9999

100100
kotlinOptions {
101-
freeCompilerArgs = ["-Xallow-result-return-type"]
102-
103101
jvmTarget = JavaVersion.VERSION_21.toString()
104102
}
105-
namespace 'jp.co.soramitsu.common'
103+
namespace = 'jp.co.soramitsu.common'
106104
}
107105

108106
dependencies {
@@ -166,4 +164,4 @@ dependencies {
166164
testImplementation project(':test-shared')
167165

168166
api libs.sharedFeaturesCoreDep
169-
}
167+
}

core-api/build.gradle

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,12 @@ android {
1818
}
1919

2020
kotlinOptions {
21-
freeCompilerArgs = ["-Xallow-result-return-type"]
22-
2321
jvmTarget = JavaVersion.VERSION_21.toString()
2422
}
25-
namespace 'jp.co.soramitsu.core'
23+
namespace = 'jp.co.soramitsu.core'
2624
}
2725

2826
dependencies {
2927
implementation libs.coroutines.core
3028
implementation libs.sharedFeaturesCoreDep
31-
}
29+
}

core-db/build.gradle

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@ android {
2626
}
2727

2828
kotlinOptions {
29-
freeCompilerArgs = ["-Xallow-result-return-type"]
30-
3129
jvmTarget = JavaVersion.VERSION_21.toString()
3230
}
3331

@@ -65,4 +63,4 @@ dependencies {
6563
androidTestImplementation projects.testShared
6664
testImplementation libs.junit
6765
testImplementation projects.testShared
68-
}
66+
}

0 commit comments

Comments
 (0)