Skip to content

Commit

Permalink
Upgrade dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
uebian committed Jan 11, 2022
1 parent 230d1ae commit 27d407f
Show file tree
Hide file tree
Showing 8 changed files with 43 additions and 16 deletions.
10 changes: 5 additions & 5 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 30
compileSdkVersion 31
defaultConfig {
applicationId "net.newlydev.fileshare_android"
minSdkVersion 21
targetSdkVersion 30
targetSdkVersion 31
versionCode 24
versionName '2.4'
multiDexEnabled = true
Expand All @@ -25,10 +25,10 @@ android {
}

dependencies {
implementation 'com.google.android.material:material:1.3.0'
implementation 'com.google.android.gms:play-services-ads:19.7.0'
implementation 'com.google.android.material:material:1.4.0'
implementation 'com.google.android.gms:play-services-ads:20.5.0'
implementation 'androidx.preference:preference:1.1.1'
implementation 'androidx.appcompat:appcompat:1.2.0'
implementation 'androidx.appcompat:appcompat:1.4.0'
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
implementation fileTree(dir: 'libs', include: ['*.aar', '*.jar'], exclude: [])
}
20 changes: 20 additions & 0 deletions app/release/output-metadata.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"version": 3,
"artifactType": {
"type": "APK",
"kind": "Directory"
},
"applicationId": "net.newlydev.fileshare_android",
"variantName": "release",
"elements": [
{
"type": "SINGLE",
"filters": [],
"attributes": [],
"versionCode": 24,
"versionName": "2.4",
"outputFile": "app-release.apk"
}
],
"elementType": "File"
}
1 change: 0 additions & 1 deletion app/release/output.json

This file was deleted.

13 changes: 8 additions & 5 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,25 +1,28 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="net.newlydev.fileshare_android" >
xmlns:tools="http://schemas.android.com/tools"
package="net.newlydev.fileshare_android" >
<uses-permission android:name="android.permission.INTERNET"/>
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
<uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
<application
android:allowBackup="true"
android:name=".mApplication"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:theme="@style/AppTheme"
android:resizeableActivity="true">
android:resizeableActivity="true"
tools:targetApi="n"
android:fullBackupContent="@xml/backup_descriptor"
android:allowBackup="true">
<meta-data
android:name="com.google.android.gms.ads.APPLICATION_ID"
android:value="ca-app-pub-4267459436057308~9756116155"/>
<activity
android:name=".activities.MainActivity"
android:label="@string/app_name"
android:launchMode="singleTask">
android:launchMode="singleTask"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.LAUNCHER"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

public class MainService extends Service
{
private static ExecutorService mainThreadPool= Executors.newCachedThreadPool();
private static final ExecutorService mainThreadPool= Executors.newCachedThreadPool();
public Handler handler=new Handler();
private NotificationCompat.Builder builder;
private ServerSocket ss;
Expand Down Expand Up @@ -43,7 +43,7 @@ public void run()
Socket client=ss.accept();
mainThreadPool.submit(new HttpThread(client,MainService.this));
}
catch (IOException e)
catch (IOException ignored)
{
}
}
Expand Down Expand Up @@ -96,7 +96,7 @@ public void run(){
{
ss.close();
}
catch (Exception e)
catch (Exception ignored)
{}
}
}.start();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ public class mApplication extends Application
public void onCreate()
{
super.onCreate();
MobileAds.initialize(this, "ca-app-pub-4267459436057308~9756116155");
MobileAds.initialize(this);
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
NotificationChannel mChannel = new NotificationChannel("0", "状态", NotificationManager.IMPORTANCE_LOW);
((NotificationManager)getSystemService(NOTIFICATION_SERVICE)).createNotificationChannel(mChannel);
Expand Down
4 changes: 4 additions & 0 deletions app/src/main/res/xml/backup_descriptor.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<full-backup-content>
<!-- Exclude specific shared preferences that contain GCM registration Id -->
</full-backup-content>
3 changes: 2 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
ext {
var = '29.0.3'
compileSdkVersion = 31
}// Top-level build file where you can add configuration options common to all sub-projects/modules.

buildscript {
Expand All @@ -8,7 +9,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:7.0.2'
classpath 'com.android.tools.build:gradle:7.0.4'

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
Expand Down

0 comments on commit 27d407f

Please sign in to comment.