Skip to content

Commit

Permalink
Update Android target API and lots of deps
Browse files Browse the repository at this point in the history
Target update required Gradle updated required Kotlin plugin update
required Kotlin update required Android Studio update required...
pimterry committed Nov 20, 2024
1 parent a4c9b23 commit b9d1e94
Showing 25 changed files with 258 additions and 124 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -10,11 +10,11 @@ jobs:
- name: Set up JDK
uses: actions/setup-java@v4
with:
java-version: 11
java-version: 21
distribution: adopt-hotspot

- name: Setup Android SDK
uses: android-actions/setup-android@v2
uses: android-actions/setup-android@v3

- name: Build release APK
run: ./gradlew assembleRelease
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -43,6 +43,8 @@ captures/
.idea/dictionaries
.idea/libraries
.idea/caches
.idea/deploymentTargetDropDown.xml
.idea/deploymentTargetSelector.xml

# Keystore files
*.jks
2 changes: 1 addition & 1 deletion .idea/compiler.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

37 changes: 37 additions & 0 deletions .idea/dynamic.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions .idea/gradle.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions .idea/jarRepositories.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/kotlinc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 10 additions & 0 deletions .idea/migrations.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/other.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 17 additions & 0 deletions .idea/runConfigurations.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

64 changes: 45 additions & 19 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,32 +1,58 @@
apply plugin: 'com.android.application'
apply plugin: 'kotlin-android'
apply plugin: 'kotlin-android-extensions'
plugins {
id 'com.android.application'
id 'kotlin-android'
id 'kotlin-parcelize'
}

android {
compileSdkVersion 33
compileSdkVersion 35

namespace "tech.httptoolkit.android"

defaultConfig {
applicationId "tech.httptoolkit.android.v1"
minSdkVersion 21
targetSdkVersion 33
targetSdkVersion 34
versionCode 33
versionName "1.4.0"

testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

buildConfigField "String", "SENTRY_DSN", "null"
manifestPlaceholders = [
sentryEnabled: "false",
sentryDsn: "null"
]
}

buildTypes {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
buildConfigField "String", "SENTRY_DSN", "\"https://6943ce7476d54485a5998ad45289a9bc@sentry.io/1809979\""

manifestPlaceholders = [
sentryEnabled: "true",
sentryDsn: "https://6943ce7476d54485a5998ad45289a9bc@sentry.io/1809979"
]
}
}

lintOptions {
lintConfig file("./lint.xml")
}

compileOptions {
sourceCompatibility JavaVersion.VERSION_11
targetCompatibility JavaVersion.VERSION_11
}

kotlinOptions {
jvmTarget = '11'
}

buildFeatures {
viewBinding true
buildConfig true
}
}

repositories {
@@ -38,22 +64,22 @@ dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.3"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.3"
implementation 'androidx.appcompat:appcompat:1.3.0'
implementation 'androidx.core:core-ktx:1.1.0'
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.0.0'
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4"
implementation 'androidx.appcompat:appcompat:1.7.0'
implementation 'androidx.core:core-ktx:1.15.0'
implementation 'androidx.constraintlayout:constraintlayout:2.2.0'
implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.1.0'
implementation 'me.dm7.barcodescanner:zxing:1.9.8'
implementation 'com.beust:klaxon:5.5'
implementation 'com.squareup.okhttp3:okhttp:4.3.0'
implementation 'com.google.android.material:material:1.4.0'
implementation 'com.google.android.material:material:1.12.0'
implementation 'net.swiftzer.semver:semver:1.1.1'
implementation 'io.sentry:sentry-android:1.7.27'
implementation 'io.sentry:sentry-android:7.18.0'
implementation 'org.slf4j:slf4j-nop:1.7.25'
implementation 'com.google.android.gms:play-services-base:10.2.4'
implementation 'com.android.installreferrer:installreferrer:1.1'
implementation 'com.google.android.gms:play-services-base:18.5.0'
implementation 'com.android.installreferrer:installreferrer:2.2'
testImplementation 'junit:junit:4.12'
androidTestImplementation 'androidx.test:runner:1.2.0'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
androidTestImplementation 'androidx.test:runner:1.6.2'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
}
19 changes: 14 additions & 5 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="tech.httptoolkit.android">
xmlns:tools="http://schemas.android.com/tools">

<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
<uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
<uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
<uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC" />
<uses-permission android:name="android.permission.CAMERA" />
<uses-permission android:name="android.permission.QUERY_ALL_PACKAGES"
tools:ignore="QueryAllPackagesPermission" />
@@ -19,9 +19,14 @@
android:name="android.permission.WRITE_EXTERNAL_STORAGE"
tools:node="remove" />

<uses-feature android:name="android.software.leanback"
<uses-feature
android:name="android.software.leanback"
android:required="false" />
<uses-feature android:name="android.hardware.touchscreen"
<uses-feature
android:name="android.hardware.touchscreen"
android:required="false" />
<uses-feature
android:name="android.hardware.camera"
android:required="false" />

<application
@@ -37,6 +42,7 @@
android:banner="@drawable/ic_tv_banner">
<service
android:name=".ProxyVpnService"
android:foregroundServiceType="dataSync"
android:permission="android.permission.BIND_VPN_SERVICE"
android:exported="true">
<intent-filter>
@@ -104,5 +110,8 @@
<activity android:name=".PortListActivity" />

<meta-data android:name="search-engine" android:resource="@xml/noindex" />

<meta-data android:name="io.sentry.enabled" android:value="${sentryEnabled}" />
<meta-data android:name="io.sentry.dsn" android:value="${sentryDsn}" />
</application>
</manifest>
Loading

0 comments on commit b9d1e94

Please sign in to comment.