Skip to content

Commit 01beed3

Browse files
fat-tirefat-tire
committed
Migrate from legacy support libraries to new Jetpack/AndroidX
1 parent 3402fb3 commit 01beed3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+108
-105
lines changed

‎cSploit/build.gradle‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ allprojects {
1919
apply plugin: 'com.android.application'
2020

2121
dependencies {
22-
implementation 'com.android.support:support-v4:27.1.1'
23-
implementation 'com.android.support:appcompat-v7:27.1.1'
24-
implementation 'com.android.support:design:27.1.1'
25-
implementation 'com.android.support:preference-v7:27.1.1'
22+
implementation 'androidx.legacy:legacy-support-v4:1.0.0-rc01'
23+
implementation 'androidx.appcompat:appcompat:1.0.0-rc01'
24+
implementation 'androidx.preference:preference:1.0.0-rc01'
25+
implementation 'com.google.android.material:material:1.0.0-rc01'
2626
implementation 'org.apache.commons:commons-compress:1.18'
2727
implementation 'commons-net:commons-net:3.6'
2828
implementation 'com.github.zafarkhaja:java-semver:0.9.0'

‎cSploit/src/main/java/org/csploit/android/ActionActivity.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
import android.content.SharedPreferences;
2222
import android.os.Bundle;
23-
import android.support.v7.app.AppCompatActivity;
23+
import androidx.appcompat.app.AppCompatActivity;
2424

2525
public class ActionActivity extends AppCompatActivity {
2626

‎cSploit/src/main/java/org/csploit/android/ActionFragment.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
import android.content.Intent;
66
import android.content.SharedPreferences;
77
import android.os.Bundle;
8-
import android.support.annotation.Nullable;
9-
import android.support.v4.app.Fragment;
10-
import android.support.v4.content.ContextCompat;
11-
import android.support.v7.app.AppCompatActivity;
8+
import androidx.annotation.Nullable;
9+
import androidx.fragment.app.Fragment;
10+
import androidx.core.content.ContextCompat;
11+
import androidx.appcompat.app.AppCompatActivity;
1212
import android.view.LayoutInflater;
1313
import android.view.MenuItem;
1414
import android.view.View;

‎cSploit/src/main/java/org/csploit/android/CSploitApplication.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import android.app.Application;
2222
import android.content.Context;
2323
import android.content.SharedPreferences;
24-
import android.support.multidex.MultiDex;
24+
import androidx.multidex.MultiDex;
2525

2626
import org.acra.ACRA;
2727
import org.acra.annotation.AcraCore;

‎cSploit/src/main/java/org/csploit/android/MainActivity.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@
2626
import android.content.SharedPreferences;
2727
import android.content.pm.PackageManager;
2828
import android.os.Bundle;
29-
import android.support.v4.app.ActivityCompat;
30-
import android.support.v4.content.ContextCompat;
31-
import android.support.v7.app.AppCompatActivity;
29+
import androidx.core.app.ActivityCompat;
30+
import androidx.core.content.ContextCompat;
31+
import androidx.appcompat.app.AppCompatActivity;
3232
import android.widget.Toast;
3333

3434
public class MainActivity extends AppCompatActivity {

‎cSploit/src/main/java/org/csploit/android/MainFragment.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@
2828
import android.net.Uri;
2929
import android.os.Build;
3030
import android.os.Bundle;
31-
import android.support.annotation.Nullable;
32-
import android.support.v4.app.Fragment;
33-
import android.support.v4.content.ContextCompat;
34-
import android.support.v7.app.AppCompatActivity;
35-
import android.support.v7.view.ActionMode;
31+
import androidx.annotation.Nullable;
32+
import androidx.fragment.app.Fragment;
33+
import androidx.core.content.ContextCompat;
34+
import androidx.appcompat.app.AppCompatActivity;
35+
import androidx.appcompat.view.ActionMode;
3636
import android.text.Html;
3737
import android.view.LayoutInflater;
3838
import android.view.Menu;

‎cSploit/src/main/java/org/csploit/android/SettingsActivity.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
import android.content.SharedPreferences;
2222
import android.os.Bundle;
23-
import android.support.v7.app.AppCompatActivity;
23+
import androidx.appcompat.app.AppCompatActivity;
2424

2525
public class SettingsActivity extends AppCompatActivity {
2626

‎cSploit/src/main/java/org/csploit/android/SettingsFragment.java‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,6 @@
2424
import android.content.IntentFilter;
2525
import android.content.SharedPreferences;
2626
import android.os.Bundle;
27-
import android.support.v4.app.Fragment;
28-
import android.support.v4.content.ContextCompat;
29-
import android.support.v7.app.AppCompatActivity;
30-
import android.support.v7.preference.EditTextPreference;
31-
import android.support.v7.preference.ListPreference;
32-
import android.support.v7.preference.Preference;
33-
import android.support.v7.preference.PreferenceFragmentCompat;
34-
import android.support.v7.preference.TwoStatePreference;
3527
import android.view.MenuItem;
3628
import android.view.View;
3729
import android.widget.Toast;
@@ -51,6 +43,15 @@
5143
import java.io.File;
5244
import java.io.IOException;
5345

46+
import androidx.appcompat.app.AppCompatActivity;
47+
import androidx.core.content.ContextCompat;
48+
import androidx.fragment.app.Fragment;
49+
import androidx.preference.EditTextPreference;
50+
import androidx.preference.ListPreference;
51+
import androidx.preference.Preference;
52+
import androidx.preference.PreferenceFragmentCompat;
53+
import androidx.preference.TwoStatePreference;
54+
5455
public class SettingsFragment extends Fragment {
5556

5657

‎cSploit/src/main/java/org/csploit/android/WifiScannerActivity.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
import android.content.SharedPreferences;
2222
import android.os.Bundle;
23-
import android.support.v7.app.AppCompatActivity;
23+
import androidx.appcompat.app.AppCompatActivity;
2424

2525
public class WifiScannerActivity extends AppCompatActivity {
2626

‎cSploit/src/main/java/org/csploit/android/WifiScannerFragment.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@
2929
import android.net.wifi.WifiConfiguration;
3030
import android.net.wifi.WifiManager;
3131
import android.os.Bundle;
32-
import android.support.v4.app.ListFragment;
33-
import android.support.v4.content.ContextCompat;
34-
import android.support.v4.view.MenuItemCompat;
35-
import android.support.v7.app.AppCompatActivity;
32+
import androidx.fragment.app.ListFragment;
33+
import androidx.core.content.ContextCompat;
34+
import androidx.core.view.MenuItemCompat;
35+
import androidx.appcompat.app.AppCompatActivity;
3636
import android.text.ClipboardManager;
3737
import android.text.Html;
3838
import android.view.LayoutInflater;

0 commit comments

Comments
 (0)