Upgrade Sdk

x-falcon · May 30, 2023 · bc0ee53 · bc0ee53
1 parent 7a6e3a6
commit bc0ee53
Show file tree

Hide file tree

Showing 18 changed files with 257 additions and 2,056 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,21 +1,23 @@
-apply plugin: 'com.android.application'
-
+plugins {
+    id 'com.android.application'
+    id 'com.google.gms.google-services'
+}
 android {
-    compileSdkVersion 30
-    buildToolsVersion "30.0.1"
+    compileSdk 33
     defaultConfig {
         applicationId "com.github.xfalcon.vhosts"
         minSdkVersion 19
-        targetSdkVersion 30
-        versionCode 38
-        versionName "2.1.1"
+        targetSdkVersion 33
+        versionCode 42
+        versionName "2.2.2"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
     }
     productFlavors.all {
         flavor -> flavor.manifestPlaceholders = [Market_CHANNEL_VALUE: name]
     }
     flavorDimensions "CHANNEL"
+
     productFlavors {
         googleplay {
             dimension "CHANNEL"
@@ -39,23 +41,29 @@ android {
         }
     }
 
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
 }
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
+    implementation platform('com.google.firebase:firebase-bom:32.1.0')
+    implementation 'com.google.firebase:firebase-analytics'
 
-    implementation 'com.google.firebase:firebase-core:17.4.4'
-//    implementation files('libs/Baidu_Mtj_3.9.0.6.jar')
-    implementation 'com.android.support:appcompat-v7:30.0.3'
-    implementation 'com.android.support:cardview-v7:30.0.3'
-    implementation 'com.android.support:preference-v7:30.0.3'
-    implementation "androidx.constraintlayout:constraintlayout:1.1.3"
+    implementation 'com.android.support:appcompat-v7:33.0.0'
+    implementation 'com.android.support:cardview-v7:33.0.0'
+    implementation 'com.android.support:preference-v7:33.0.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation 'com.github.zcweng:switch-button:0.0.3@aar'
     implementation 'com.github.clans:fab:1.6.4'
-    testImplementation 'junit:junit:4.12'
+    implementation 'com.android.billingclient:billing:6.0.0'
+
+    testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'com.android.support.test:rules:1.0.2'
     androidTestImplementation 'com.android.support.test:runner:1.0.2'
     androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
 }
 
-apply plugin: 'com.google.gms.google-services'
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.github.xfalcon.vhosts">
+          xmlns:tools="http://schemas.android.com/tools" package="com.github.xfalcon.vhosts">
 
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
@@ -15,11 +15,13 @@
 <!--    <uses-permission android:name="android.permission.BLUETOOTH"/>-->
 <!--    <uses-permission android:name="android.permission.WRITE_SETTINGS"/>-->
 <!--    <uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS"/>-->
-    <uses-permission android:name="com.android.vending.BILLING"/>
 
     <uses-permission android:name="android.permission.WAKE_LOCK" />
 
 
+    <uses-permission android:name="com.android.vending.BILLING"/>
+    <uses-permission android:name="android.permission.BIND_VPN_SERVICE" tools:ignore="ProtectedPermissions"/>
+
     <supports-screens
             android:anyDensity="true"
             android:largeScreens="true"
@@ -36,23 +38,13 @@
             android:hardwareAccelerated="true"
             android:largeHeap="true"
             android:theme="@style/AppTheme">
-        <activity android:name=".VhostsActivity">
+        <activity android:name=".VhostsActivity" android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
 
-        <receiver android:name="com.google.android.gms.analytics.AnalyticsReceiver"
-                  android:enabled="true">
-            <intent-filter>
-                <action android:name="com.google.android.gms.analytics.ANALYTICS_DISPATCH" />
-            </intent-filter>
-        </receiver>
-        <service android:name="com.google.android.gms.analytics.AnalyticsService"
-                 android:enabled="true"
-                 android:exported="false"/>
-
         <receiver
                 android:name=".BootReceiver"
                 android:enabled="true"
@@ -92,13 +84,14 @@
                 android:name=".QuickStartTileService"
                 android:icon="@drawable/tile"
                 android:label="@string/app_name"
-                android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
+                android:permission="android.permission.BIND_QUICK_SETTINGS_TILE"
+                android:exported="true">
             <intent-filter>
                 <action android:name="android.service.quicksettings.action.QS_TILE"/>
             </intent-filter>
         </service>
 
-        <receiver android:name=".QuickStartWidget">
+        <receiver android:name=".QuickStartWidget" android:exported="true">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE"/>
                 <action android:name="com.github.xfalcon.ACTION_QUICK_START_BUTTON"/>
@@ -109,16 +102,18 @@
                     android:resource="@xml/quick_start_widget_info"/>
         </receiver>
 
-        <activity android:name=".DonationActivity">
+        <activity android:name=".DonationActivity"
+                  android:exported="false">
         </activity>
 
         <activity android:name=".SettingsActivity"
                   android:label="Settings"
-                  android:parentActivityName=".VhostsActivity">
+                  android:parentActivityName=".VhostsActivity"
+                  android:exported="false">
             <meta-data
                     android:name="android.support.PARENT_ACTIVITY"
                     android:value=".VhostsActivity"/>
         </activity>
     </application>
 
-</manifest>
+</manifest>