Skip to content

Commit 26a018a

Browse files
committed
Update all the things and fix some lint issues
1 parent 7e82e09 commit 26a018a

File tree

9 files changed

+251
-157
lines changed

9 files changed

+251
-157
lines changed

app/build.gradle.kts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,10 @@ android {
3737
targetCompatibility = JavaVersion.VERSION_11
3838
}
3939

40-
kotlinOptions {
41-
jvmTarget = "11"
40+
kotlin {
41+
compilerOptions {
42+
jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_11)
43+
}
4244
}
4345

4446
buildFeatures {

app/src/main/java/tech/httptoolkit/android/ApplicationListActivity.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ class ApplicationListActivity : AppCompatActivity(), SwipeRefreshLayout.OnRefres
117117
.filter { pkg ->
118118
pkg.applicationInfo != null
119119
}.sortedBy { pkg ->
120-
AppLabelCache.getAppLabel(packageManager, pkg.applicationInfo!!).toUpperCase(
120+
AppLabelCache.getAppLabel(packageManager, pkg.applicationInfo!!).uppercase(
121121
Locale.getDefault()
122122
)
123123
}

app/src/main/java/tech/httptoolkit/android/vpn/transport/udp/UDPPacketFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ public static byte[] createResponsePacket(IPv4Header ip, UDPHeader udp, byte[] p
9191

9292
//now copy udp data
9393
if (packetData != null)
94-
System.arraycopy(packetData, 0, buffer, start, packetData.length);
94+
System.arraycopy(packetData, 0, buffer, start, packetData.length);
9595

9696
return buffer;
9797
}

app/src/main/res/layout/item_port_row.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
3+
xmlns:app="http://schemas.android.com/apk/res-auto"
34
xmlns:tools="http://schemas.android.com/tools"
45
android:layout_width="match_parent"
56
android:layout_marginEnd="8dp"
@@ -38,7 +39,7 @@
3839
android:layout_height="wrap_content"
3940
android:layout_alignParentEnd="true"
4041
android:layout_centerVertical="true"
41-
android:tint="@color/textColor"
42+
app:tint="@color/textColor"
4243
android:minWidth="0dp"
4344
android:minHeight="0dp" />
4445
</RelativeLayout>

gradle/libs.versions.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[versions]
2-
kotlin = "1.9.25"
3-
androidGradlePlugin = "8.7.3"
2+
kotlin = "2.2.21"
3+
androidGradlePlugin = "8.13.0"
44
appcompat = "1.7.0"
55
constraintlayout = "2.2.0"
66
core = "3.4.1"
@@ -10,7 +10,7 @@ googleServices = "4.4.2"
1010
installreferrer = "2.2"
1111
junit = "4.13.2"
1212
klaxon = "5.5"
13-
kotlinxCoroutinesCore = "1.8.1"
13+
kotlinxCoroutinesCore = "1.10.2"
1414
localbroadcastmanager = "1.1.0"
1515
material = "1.12.0"
1616
okhttp = "4.11.0"

gradle/wrapper/gradle-wrapper.jar

-10.5 KB
Binary file not shown.
Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
#Wed Nov 20 12:08:44 CET 2024
21
distributionBase=GRADLE_USER_HOME
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip
42
distributionPath=wrapper/dists
5-
zipStorePath=wrapper/dists
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
4+
networkTimeout=10000
5+
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME
7+
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)