Skip to content

Commit b1f8df6

Browse files
uasouzuasouz
committed
Fixed gradle dependencies and imports to be compatible with AndroidX libraries
1 parent bb67911 commit b1f8df6

File tree

15 files changed

+67
-43
lines changed

15 files changed

+67
-43
lines changed

‎app/build.gradle

+17-5
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,30 @@
11
apply plugin: 'com.android.application'
22

3+
buildscript {
4+
repositories {
5+
google()
6+
jcenter()
7+
maven { url 'https://jitpack.io' }
8+
}
9+
}
10+
311
android {
4-
compileSdkVersion 25
5-
buildToolsVersion "25.0.3"
12+
compileSdkVersion 28
13+
buildToolsVersion '28.0.2'
614
defaultConfig {
715
applicationId 'com.vansuita.pickimage.sample'
816
minSdkVersion 14
9-
targetSdkVersion 25
17+
targetSdkVersion 28
1018
versionCode 4
1119
versionName "1.0"
1220
}
1321
}
1422

1523
dependencies {
16-
compile project(':library')
17-
compile 'com.jrummyapps:colorpicker:2.0.4'
24+
implementation project(':library')
25+
26+
implementation 'androidx.appcompat:appcompat:1.0.0'
27+
implementation 'androidx.cardview:cardview:1.0.0'
28+
implementation 'org.jetbrains:annotations-java5:15.0'
29+
implementation 'com.jrummyapps:colorpicker:2.0.4'
1830
}

‎app/src/main/AndroidManifest.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
</activity>
2222

2323
<provider
24-
android:name="android.support.v4.content.FileProvider"
24+
android:name="androidx.core.content.FileProvider"
2525
android:authorities="${applicationId}.com.vansuita.pickimage.provider"
2626
android:exported="false"
2727
android:grantUriPermissions="true"

‎app/src/main/java/com/vansuita/pickimage/sample/act/BaseSampleActivity.java

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
package com.vansuita.pickimage.sample.act;
22

3+
import android.app.Activity;
34
import android.content.SharedPreferences;
45
import android.os.Bundle;
56
import android.os.Handler;
67
import android.preference.PreferenceFragment;
78
import android.preference.PreferenceGroup;
89
import android.preference.PreferenceManager;
9-
import android.support.annotation.Nullable;
10-
import android.support.v7.app.AppCompatActivity;
1110
import android.view.View;
1211
import android.widget.ImageView;
1312
import android.widget.ListView;
@@ -17,6 +16,10 @@
1716
import com.vansuita.pickimage.enums.EPickType;
1817
import com.vansuita.pickimage.sample.R;
1918

19+
import org.jetbrains.annotations.Nullable;
20+
21+
import androidx.appcompat.app.AppCompatActivity;
22+
2023
/**
2124
* Created by jrvansuita build 30/01/17.
2225
*/

‎app/src/main/java/com/vansuita/pickimage/sample/act/SampleActivity.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
package com.vansuita.pickimage.sample.act;
22

33
import android.os.Bundle;
4-
import android.support.annotation.Nullable;
54
import android.widget.Toast;
65

76
import com.vansuita.pickimage.bean.PickResult;
87
import com.vansuita.pickimage.bundle.PickSetup;
98
import com.vansuita.pickimage.dialog.PickImageDialog;
109
import com.vansuita.pickimage.listeners.IPickResult;
1110

11+
import org.jetbrains.annotations.Nullable;
12+
1213
public class SampleActivity extends BaseSampleActivity implements IPickResult /*, IPickClick */ {
1314

1415
@Override

‎app/src/main/res/layout/sample_layout.xml

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
3+
xmlns:app="http://schemas.android.com/apk/res-auto"
34
android:id="@+id/scroll"
45
android:layout_width="match_parent"
56
android:layout_height="match_parent"
@@ -12,7 +13,7 @@
1213
android:orientation="vertical"
1314
android:paddingTop="20dp">
1415

15-
<android.support.v7.widget.CardView
16+
<androidx.cardview.widget.CardView
1617
android:layout_width="wrap_content"
1718
android:layout_height="wrap_content"
1819
android:layout_margin="10dp">
@@ -43,9 +44,9 @@
4344
android:minWidth="200dp"
4445
android:padding="5dp"
4546
android:scaleType="centerInside"
46-
android:src="@mipmap/default_image" />
47+
app:srcCompat="@mipmap/default_image" />
4748
</LinearLayout>
48-
</android.support.v7.widget.CardView>
49+
</androidx.cardview.widget.CardView>
4950

5051
<FrameLayout
5152
android:id="@+id/prefs_holder"

‎build.gradle

+3-1
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,12 @@
33
buildscript {
44
repositories {
55
jcenter()
6+
google()
67
}
78

89
dependencies {
910

10-
classpath 'com.android.tools.build:gradle:2.3.0'
11+
classpath 'com.android.tools.build:gradle:3.2.0'
1112
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5' // Add this line
1213
}
1314
}
@@ -17,6 +18,7 @@ allprojects {
1718
jcenter()
1819

1920
maven { url "https://jitpack.io" }
21+
google()
2022
}
2123
}
2224

‎gradle.properties

+2
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99

1010
# Specifies the JVM arguments used for the daemon process.
1111
# The setting is particularly useful for tweaking memory settings.
12+
android.enableJetifier=true
13+
android.useAndroidX=true
1214
org.gradle.jvmargs=-Xmx1536m
1315

1416
# When configured, Gradle will run in incubating parallel mode.

‎gradle/wrapper/gradle-wrapper.properties

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Fri Mar 10 13:58:41 BRT 2017
1+
#Wed Sep 26 15:59:33 AMT 2018
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip

‎library/build.gradle

+6-6
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ apply plugin: 'com.github.dcendents.android-maven'
55
group = 'com.github.jrvansuita'
66

77
android {
8-
compileSdkVersion 25
9-
buildToolsVersion "25.0.3"
8+
compileSdkVersion 28
9+
buildToolsVersion "28.0.2"
1010

1111
defaultConfig {
1212
minSdkVersion 9
13-
targetSdkVersion 25
13+
targetSdkVersion 28
1414
versionCode 1
1515
versionName "1.0"
1616
}
@@ -21,8 +21,8 @@ android {
2121
}
2222

2323
dependencies {
24-
compile 'com.android.support:appcompat-v7:25.2.0'
25-
compile 'com.android.support:cardview-v7:25.2.0'
26-
compile 'com.android.support:support-annotations:25.2.0'
24+
implementation 'androidx.appcompat:appcompat:1.0.0'
25+
implementation 'androidx.cardview:cardview:1.0.0'
26+
implementation 'androidx.annotation:annotation:1.0.0'
2727
}
2828

‎library/src/main/AndroidManifest.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
android:screenOrientation="portrait">
1515

1616
<provider
17-
android:name="android.support.v4.content.FileProvider"
17+
android:name="androidx.core.content.FileProvider"
1818
android:authorities="com.vansuita.pickimage.provider"
1919
android:exported="false"
2020
android:grantUriPermissions="true">

‎library/src/main/java/com/vansuita/pickimage/bundle/PickSetup.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.vansuita.pickimage.bundle;
22

33
import android.graphics.Color;
4-
import android.support.annotation.IntDef;
4+
import androidx.annotation.IntDef;
55
import android.view.Gravity;
66
import android.widget.LinearLayout;
77

‎library/src/main/java/com/vansuita/pickimage/dialog/PickImageBaseDialog.java

+6-5
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,11 @@
55
import android.graphics.drawable.ColorDrawable;
66
import android.os.Bundle;
77
import android.os.Handler;
8-
import android.support.annotation.Nullable;
9-
import android.support.v4.app.DialogFragment;
10-
import android.support.v7.widget.CardView;
11-
import android.support.v7.widget.LinearLayoutCompat;
8+
import androidx.annotation.Nullable;
9+
import androidx.appcompat.app.AppCompatActivity;
10+
import androidx.fragment.app.DialogFragment;
11+
import androidx.cardview.widget.CardView;
12+
import androidx.appcompat.widget.LinearLayoutCompat;
1213
import android.view.LayoutInflater;
1314
import android.view.View;
1415
import android.view.ViewGroup;
@@ -126,7 +127,7 @@ protected void onInitialize(Bundle savedInstanceState) {
126127
if (savedInstanceState != null) {
127128
resolverState = savedInstanceState.getBundle(RESOLVER_STATE_TAG);
128129
}
129-
this.resolver = new IntentResolver(getActivity(), setup, resolverState);
130+
this.resolver = new IntentResolver((AppCompatActivity) getActivity(), setup, resolverState);
130131
}
131132

132133

‎library/src/main/java/com/vansuita/pickimage/dialog/PickImageDialog.java

+5-4
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@
44
import android.content.Intent;
55
import android.content.pm.PackageManager;
66
import android.os.Bundle;
7-
import android.support.annotation.NonNull;
8-
import android.support.v4.app.FragmentActivity;
9-
import android.support.v4.app.FragmentManager;
107

118
import com.vansuita.pickimage.bundle.PickSetup;
129
import com.vansuita.pickimage.keep.Keep;
@@ -15,7 +12,11 @@
1512
import com.vansuita.pickimage.listeners.IPickResult;
1613
import com.vansuita.pickimage.resolver.IntentResolver;
1714

18-
import static android.app.Activity.RESULT_OK;
15+
import androidx.annotation.NonNull;
16+
import androidx.fragment.app.FragmentActivity;
17+
import androidx.fragment.app.FragmentManager;
18+
19+
import static androidx.appcompat.app.AppCompatActivity.RESULT_OK;
1920

2021

2122
/**

‎library/src/main/java/com/vansuita/pickimage/resolver/IntentResolver.java

+10-9
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package com.vansuita.pickimage.resolver;
22

33
import android.Manifest;
4-
import android.app.Activity;
54
import android.content.Intent;
65
import android.content.pm.ApplicationInfo;
76
import android.content.pm.PackageManager;
@@ -12,11 +11,6 @@
1211
import android.os.Environment;
1312
import android.os.Parcelable;
1413
import android.provider.MediaStore;
15-
import android.support.annotation.NonNull;
16-
import android.support.v4.app.ActivityCompat;
17-
import android.support.v4.app.Fragment;
18-
import android.support.v4.content.ContextCompat;
19-
import android.support.v4.content.FileProvider;
2014
import android.util.Log;
2115

2216
import com.vansuita.pickimage.R;
@@ -30,6 +24,13 @@
3024
import java.util.Date;
3125
import java.util.List;
3226

27+
import androidx.annotation.NonNull;
28+
import androidx.appcompat.app.AppCompatActivity;
29+
import androidx.core.app.ActivityCompat;
30+
import androidx.core.content.ContextCompat;
31+
import androidx.core.content.FileProvider;
32+
import androidx.fragment.app.Fragment;
33+
3334
/**
3435
* Created by jrvansuita build 07/02/17.
3536
*/
@@ -39,15 +40,15 @@ public class IntentResolver {
3940
public static final int REQUESTER = 99;
4041
public static final String SAVE_FILE_PATH_TAG = "savePath";
4142

42-
private Activity activity;
43+
private AppCompatActivity activity;
4344

4445
private PickSetup setup;
4546
private Intent galleryIntent;
4647
private Intent cameraIntent;
4748
private File saveFile;
4849

4950

50-
public IntentResolver(Activity activity, PickSetup setup, Bundle savedInstanceState) {
51+
public IntentResolver(AppCompatActivity activity, PickSetup setup, Bundle savedInstanceState) {
5152
this.activity = activity;
5253
this.setup = setup;
5354

@@ -247,7 +248,7 @@ public boolean fromCamera(Intent data) {
247248
return (data == null || data.getData() == null || data.getData().toString().contains(cameraFile().toString()));
248249
}
249250

250-
public Activity getActivity() {
251+
public AppCompatActivity getActivity() {
251252
return activity;
252253
}
253254

‎library/src/main/res/layout/dialog.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
android:layout_height="wrap_content"
77
android:padding="5dp">
88

9-
<android.support.v7.widget.CardView
9+
<androidx.cardview.widget.CardView
1010
android:id="@+id/card"
1111
xmlns:card_view="http://schemas.android.com/apk/res-auto"
1212
android:layout_width="wrap_content"
@@ -109,5 +109,5 @@
109109
</LinearLayout>
110110

111111
</FrameLayout>
112-
</android.support.v7.widget.CardView>
112+
</androidx.cardview.widget.CardView>
113113
</FrameLayout>

0 commit comments

Comments
 (0)