Skip to content

Commit 9879f9f

Browse files
committed
Update Android target API and lots of deps
Target update required Gradle updated required Kotlin plugin update required Kotlin update required Android Studio update required...
1 parent a4c9b23 commit 9879f9f

25 files changed

+260
-126
lines changed

.github/workflows/ci.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ jobs:
1010
- name: Set up JDK
1111
uses: actions/setup-java@v4
1212
with:
13-
java-version: 11
13+
java-version: 21
1414
distribution: adopt-hotspot
1515

1616
- name: Setup Android SDK
17-
uses: android-actions/setup-android@v2
17+
uses: android-actions/setup-android@v3
1818

1919
- name: Build release APK
2020
run: ./gradlew assembleRelease

.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,8 @@ captures/
4343
.idea/dictionaries
4444
.idea/libraries
4545
.idea/caches
46+
.idea/deploymentTargetDropDown.xml
47+
.idea/deploymentTargetSelector.xml
4648

4749
# Keystore files
4850
*.jks

.idea/compiler.xml

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/dynamic.xml

+37
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/gradle.xml

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/jarRepositories.xml

+5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/kotlinc.xml

+6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/migrations.xml

+10
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/misc.xml

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/other.xml

+6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/runConfigurations.xml

+17
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/build.gradle

+47-21
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,58 @@
1-
apply plugin: 'com.android.application'
2-
apply plugin: 'kotlin-android'
3-
apply plugin: 'kotlin-android-extensions'
1+
plugins {
2+
id 'com.android.application'
3+
id 'kotlin-android'
4+
id 'kotlin-parcelize'
5+
}
46

57
android {
6-
compileSdkVersion 33
8+
compileSdkVersion 35
9+
10+
namespace "tech.httptoolkit.android"
711

812
defaultConfig {
913
applicationId "tech.httptoolkit.android.v1"
1014
minSdkVersion 21
11-
targetSdkVersion 33
12-
versionCode 33
13-
versionName "1.4.0"
15+
targetSdkVersion 34
16+
versionCode 34
17+
versionName "1.5.0"
1418

1519
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1620

17-
buildConfigField "String", "SENTRY_DSN", "null"
21+
manifestPlaceholders = [
22+
sentryEnabled: "false",
23+
sentryDsn: "null"
24+
]
1825
}
1926

2027
buildTypes {
2128
release {
2229
minifyEnabled false
2330
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
24-
buildConfigField "String", "SENTRY_DSN", "\"https://[email protected]/1809979\""
31+
32+
manifestPlaceholders = [
33+
sentryEnabled: "true",
34+
sentryDsn: "https://[email protected]/1809979"
35+
]
2536
}
2637
}
38+
2739
lintOptions {
2840
lintConfig file("./lint.xml")
2941
}
42+
43+
compileOptions {
44+
sourceCompatibility JavaVersion.VERSION_11
45+
targetCompatibility JavaVersion.VERSION_11
46+
}
47+
48+
kotlinOptions {
49+
jvmTarget = '11'
50+
}
51+
52+
buildFeatures {
53+
viewBinding true
54+
buildConfig true
55+
}
3056
}
3157

3258
repositories {
@@ -38,22 +64,22 @@ dependencies {
3864
implementation fileTree(dir: 'libs', include: ['*.jar'])
3965
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
4066
implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
41-
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.3"
42-
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.3"
43-
implementation 'androidx.appcompat:appcompat:1.3.0'
44-
implementation 'androidx.core:core-ktx:1.1.0'
45-
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
46-
implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.0.0'
67+
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4"
68+
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4"
69+
implementation 'androidx.appcompat:appcompat:1.7.0'
70+
implementation 'androidx.core:core-ktx:1.15.0'
71+
implementation 'androidx.constraintlayout:constraintlayout:2.2.0'
72+
implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.1.0'
4773
implementation 'me.dm7.barcodescanner:zxing:1.9.8'
4874
implementation 'com.beust:klaxon:5.5'
4975
implementation 'com.squareup.okhttp3:okhttp:4.3.0'
50-
implementation 'com.google.android.material:material:1.4.0'
76+
implementation 'com.google.android.material:material:1.12.0'
5177
implementation 'net.swiftzer.semver:semver:1.1.1'
52-
implementation 'io.sentry:sentry-android:1.7.27'
78+
implementation 'io.sentry:sentry-android:7.18.0'
5379
implementation 'org.slf4j:slf4j-nop:1.7.25'
54-
implementation 'com.google.android.gms:play-services-base:10.2.4'
55-
implementation 'com.android.installreferrer:installreferrer:1.1'
80+
implementation 'com.google.android.gms:play-services-base:18.5.0'
81+
implementation 'com.android.installreferrer:installreferrer:2.2'
5682
testImplementation 'junit:junit:4.12'
57-
androidTestImplementation 'androidx.test:runner:1.2.0'
58-
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
83+
androidTestImplementation 'androidx.test:runner:1.6.2'
84+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
5985
}

app/src/main/AndroidManifest.xml

+14-5
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest
33
xmlns:android="http://schemas.android.com/apk/res/android"
4-
xmlns:tools="http://schemas.android.com/tools"
5-
package="tech.httptoolkit.android">
4+
xmlns:tools="http://schemas.android.com/tools">
65

76
<uses-permission android:name="android.permission.INTERNET" />
87
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
98
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
10-
<uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
9+
<uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
10+
<uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC" />
1111
<uses-permission android:name="android.permission.CAMERA" />
1212
<uses-permission android:name="android.permission.QUERY_ALL_PACKAGES"
1313
tools:ignore="QueryAllPackagesPermission" />
@@ -19,9 +19,14 @@
1919
android:name="android.permission.WRITE_EXTERNAL_STORAGE"
2020
tools:node="remove" />
2121

22-
<uses-feature android:name="android.software.leanback"
22+
<uses-feature
23+
android:name="android.software.leanback"
2324
android:required="false" />
24-
<uses-feature android:name="android.hardware.touchscreen"
25+
<uses-feature
26+
android:name="android.hardware.touchscreen"
27+
android:required="false" />
28+
<uses-feature
29+
android:name="android.hardware.camera"
2530
android:required="false" />
2631

2732
<application
@@ -37,6 +42,7 @@
3742
android:banner="@drawable/ic_tv_banner">
3843
<service
3944
android:name=".ProxyVpnService"
45+
android:foregroundServiceType="dataSync"
4046
android:permission="android.permission.BIND_VPN_SERVICE"
4147
android:exported="true">
4248
<intent-filter>
@@ -104,5 +110,8 @@
104110
<activity android:name=".PortListActivity" />
105111

106112
<meta-data android:name="search-engine" android:resource="@xml/noindex" />
113+
114+
<meta-data android:name="io.sentry.enabled" android:value="${sentryEnabled}" />
115+
<meta-data android:name="io.sentry.dsn" android:value="${sentryDsn}" />
107116
</application>
108117
</manifest>

0 commit comments

Comments
 (0)