Skip to content

Commit 030b1eb

Browse files
committed
upgrade Gradle plugin
1 parent 29bf07f commit 030b1eb

9 files changed

Lines changed: 13 additions & 10 deletions

File tree

app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ if (propFile.canRead()) {
143143
}
144144

145145
task certificatesZip(type: Zip) {
146-
archiveName = 'certificates_zip'
146+
archiveBaseName = 'certificates_zip'
147147
from files('' + i2pbase + '/installer/resources/certificates')
148148
}
149149
task copyI2PResources(type: Copy) {

app/src/main/AndroidManifest.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
package="net.i2p.android.router"
43
android:installLocation="auto"
54
android:sharedUserId="net.i2p">
65

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ buildscript {
1515
google()
1616
}
1717
dependencies {
18-
classpath 'com.android.tools.build:gradle:7.4.2'
18+
classpath 'com.android.tools.build:gradle:8.3.1'
1919
classpath 'com.android.tools.lint:lint-gradle:26.1.1'
2020
}
2121
}

gradle.properties

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,3 +31,6 @@ POM_URL=https\://github.com/i2p/i2p.android.base
3131
android.enableJetifier=true
3232
android.useAndroidX=true
3333
org.gradle.jvmargs=-Xmx1536M
34+
android.defaults.buildfeatures.buildconfig=true
35+
android.nonTransitiveRClass=false
36+
android.nonFinalResIds=false

gradle/maven-push.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,12 +125,12 @@ afterEvaluate { project ->
125125
}
126126

127127
task androidJavadocsJar(type: Jar, dependsOn: androidJavadocs) {
128-
classifier = 'javadoc'
128+
archiveClassifier = 'javadoc'
129129
from androidJavadocs.destinationDir
130130
}
131131

132132
task androidSourcesJar(type: Jar) {
133-
classifier = 'sources'
133+
archiveClassifier = 'sources'
134134
from android.sourceSets.main.java.sourceFiles
135135
}
136136

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip

lib/client/src/main/AndroidManifest.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2-
package="net.i2p.android.lib.client">
1+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
32

43
<application android:allowBackup="true"
54
android:label="@string/app_name">

lib/helper/build.gradle

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ android {
2323
abortOnError false
2424
}
2525
namespace 'net.i2p.android.lib.helper'
26+
buildFeatures {
27+
aidl true
28+
}
2629
}
2730

2831
dependencies {

lib/helper/src/main/AndroidManifest.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2-
package="net.i2p.android.lib.helper">
1+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
32

43
<application android:allowBackup="true"
54
android:label="@string/app_name">

0 commit comments

Comments
 (0)