Skip to content

Commit

Permalink
support Android 12
Browse files Browse the repository at this point in the history
  • Loading branch information
isayan committed Apr 23, 2022
1 parent 6764f5a commit beac530
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 16 deletions.
2 changes: 1 addition & 1 deletion Readme-ja.md
Original file line number Diff line number Diff line change
Expand Up @@ -125,4 +125,4 @@ SSLを復号化するには、ローカルプロキシツールのRoot証明書
## 開発環境

* JRE(JDK) 1.8以上(Open JDK)
* AndroidStudio 3.6.1 (https://developer.android.com/studio/index.html)
* AndroidStudio 2021.1.1 (https://developer.android.com/studio/index.html)
2 changes: 1 addition & 1 deletion Readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -121,4 +121,4 @@ Most of the code was created based on the following applications for creating ap
## Development environment

* JRE(JDK) 1.8 or later(Open JDK)
* AndroidStudio 3.6.1 (https://developer.android.com/studio/index.html)
* AndroidStudio 2021.1.1 (https://developer.android.com/studio/index.html)
8 changes: 4 additions & 4 deletions android_app/app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 30
buildToolsVersion "30.0.3"
compileSdkVersion 31
buildToolsVersion "31.0.0"

sourceCompatibility = '1.8' // -source
targetCompatibility = '1.8' // -target

defaultConfig {
applicationId "tun.proxy"
minSdkVersion 21
targetSdkVersion 30
versionCode 100260
targetSdkVersion 31
versionCode 100270
versionName VERSION_NAME
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
externalNativeBuild {
Expand Down
10 changes: 6 additions & 4 deletions android_app/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@
<activity
android:name=".MainActivity"
android:label="@string/app_name"
android:theme="@style/AppTheme.NoActionBar">
android:theme="@style/AppTheme.NoActionBar"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
Expand All @@ -36,15 +36,17 @@

<service
android:name=".service.Tun2HttpVpnService"
android:permission="android.permission.BIND_VPN_SERVICE">
android:permission="android.permission.BIND_VPN_SERVICE"
android:exported="true">
<intent-filter>
<action android:name="android.net.VpnService" />
</intent-filter>
</service>

<receiver
android:name=".receiver.BootReceiver"
android:label="@string/app_name">
android:label="@string/app_name"
android:exported="true">
<intent-filter android:priority="999">
<action android:name="android.intent.action.BOOT_COMPLETED" />
</intent-filter>
Expand Down
6 changes: 1 addition & 5 deletions android_app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,8 @@ buildscript {

}


dependencies {
classpath 'com.android.tools.build:gradle:4.2.2'

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
classpath 'com.android.tools.build:gradle:7.0.2'
}
}

Expand Down
2 changes: 1 addition & 1 deletion android_app/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ android.useAndroidX=true
android.enableJetifier=true

APP_NAME=TunProxy
VERSION_NAME=1.2.6
VERSION_NAME=1.2.7

productKeyStore=../changeit.jks
productKeyAlias=key0
Expand Down

0 comments on commit beac530

Please sign in to comment.