Skip to content

Commit 39557b2

Browse files
ParaskP7ParaskP7
authored
Merge pull request #105 from wordpress-mobile/update/gradle-to-7.3.3-agp-to-7.0.4
Upgrade Gradle to 7.4 & AGP to 7.1.1 (& Min SDK Version)
2 parents a011e7c + ad75f64 commit 39557b2

File tree

13 files changed

+196
-193
lines changed

13 files changed

+196
-193
lines changed

‎.buildkite/pipeline.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
common-params:
22
&docker-container
33
docker#v3.8.0:
4-
image: "public.ecr.aws/automattic/android-build-image:v1.1.0"
4+
image: "public.ecr.aws/automattic/android-build-image:v1.2.0"
55
propagate-environment: true
66
environment:
77
# DO NOT MANUALLY SET THESE VALUES!

‎WordPressUtils/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ android {
4242
compileSdkVersion 30
4343

4444
defaultConfig {
45-
minSdkVersion 18
45+
minSdkVersion 21
4646
targetSdkVersion 30
4747

4848
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

‎WordPressUtils/src/main/java/org/wordpress/android/util/DeviceUtils.java

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,6 @@ private DeviceUtils() {
5050
*/
5151
public boolean hasCamera(Context context) {
5252
final PackageManager pm = context.getPackageManager();
53-
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN_MR1) {
54-
return pm.hasSystemFeature(PackageManager.FEATURE_CAMERA)
55-
|| pm.hasSystemFeature("android.hardware.camera.front");
56-
}
57-
5853
return pm.hasSystemFeature("android.hardware.camera.any");
5954
}
6055

@@ -141,14 +136,7 @@ public static String getTotalAvailableMemorySize() {
141136

142137
private static long availableSpaceAtFilePath(File path) {
143138
StatFs stat = new StatFs(path.getPath());
144-
long bytesAvailable;
145-
if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.JELLY_BEAN_MR2) {
146-
return stat.getBlockSizeLong() * stat.getAvailableBlocksLong();
147-
} else {
148-
//noinspection deprecation - Deprecated calls properly handled
149-
bytesAvailable = (long) stat.getBlockSize() * (long) stat.getAvailableBlocks();
150-
}
151-
return bytesAvailable;
139+
return stat.getBlockSizeLong() * stat.getAvailableBlocksLong();
152140
}
153141

154142
private static String formatSize(long size) {

‎WordPressUtils/src/main/java/org/wordpress/android/util/EmoticonsUtils.java

Lines changed: 24 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -11,43 +11,39 @@
1111
import java.util.HashMap;
1212
import java.util.Map;
1313

14-
import static android.os.Build.VERSION.SDK_INT;
15-
import static android.os.Build.VERSION_CODES;
16-
1714
public class EmoticonsUtils {
1815
public static final int EMOTICON_COLOR = 0xFF21759B;
19-
private static final boolean HAS_EMOJI = SDK_INT >= VERSION_CODES.JELLY_BEAN;
2016
private static final Map<String, String> WP_SMILIES;
2117
public static final SparseArray<String> WP_SMILIES_CODE_POINT_TO_TEXT;
2218

2319
static {
24-
Map<String, String> smilies = new HashMap<String, String>();
25-
smilies.put("icon_mrgreen.gif", HAS_EMOJI ? "\uD83D\uDE00" : ":mrgreen:");
26-
smilies.put("icon_neutral.gif", HAS_EMOJI ? "\uD83D\uDE14" : ":|");
27-
smilies.put("icon_twisted.gif", HAS_EMOJI ? "\uD83D\uDE16" : ":twisted:");
28-
smilies.put("icon_arrow.gif", HAS_EMOJI ? "\u27A1" : ":arrow:");
29-
smilies.put("icon_eek.gif", HAS_EMOJI ? "\uD83D\uDE32" : "8-O");
30-
smilies.put("icon_smile.gif", HAS_EMOJI ? "\uD83D\uDE0A" : ":)");
31-
smilies.put("icon_confused.gif", HAS_EMOJI ? "\uD83D\uDE15" : ":?");
32-
smilies.put("icon_cool.gif", HAS_EMOJI ? "\uD83D\uDE0A" : "8)");
33-
smilies.put("icon_evil.gif", HAS_EMOJI ? "\uD83D\uDE21" : ":evil:");
34-
smilies.put("icon_biggrin.gif", HAS_EMOJI ? "\uD83D\uDE03" : ":D");
35-
smilies.put("icon_idea.gif", HAS_EMOJI ? "\uD83D\uDCA1" : ":idea:");
36-
smilies.put("icon_redface.gif", HAS_EMOJI ? "\uD83D\uDE33" : ":oops:");
37-
smilies.put("icon_razz.gif", HAS_EMOJI ? "\uD83D\uDE1D" : ":P");
38-
smilies.put("icon_rolleyes.gif", HAS_EMOJI ? "\uD83D\uDE0F" : ":roll:");
39-
smilies.put("icon_wink.gif", HAS_EMOJI ? "\uD83D\uDE09" : ";)");
40-
smilies.put("icon_cry.gif", HAS_EMOJI ? "\uD83D\uDE22" : ":'(");
41-
smilies.put("icon_surprised.gif", HAS_EMOJI ? "\uD83D\uDE32" : ":o");
42-
smilies.put("icon_lol.gif", HAS_EMOJI ? "\uD83D\uDE03" : ":lol:");
43-
smilies.put("icon_mad.gif", HAS_EMOJI ? "\uD83D\uDE21" : ":x");
44-
smilies.put("icon_sad.gif", HAS_EMOJI ? "\uD83D\uDE1E" : ":(");
45-
smilies.put("icon_exclaim.gif", HAS_EMOJI ? "\u2757" : ":!:");
46-
smilies.put("icon_question.gif", HAS_EMOJI ? "\u2753" : ":?:");
20+
Map<String, String> smilies = new HashMap<>();
21+
smilies.put("icon_mrgreen.gif", "\uD83D\uDE00");
22+
smilies.put("icon_neutral.gif", "\uD83D\uDE14");
23+
smilies.put("icon_twisted.gif", "\uD83D\uDE16");
24+
smilies.put("icon_arrow.gif", "\u27A1");
25+
smilies.put("icon_eek.gif", "\uD83D\uDE32");
26+
smilies.put("icon_smile.gif", "\uD83D\uDE0A");
27+
smilies.put("icon_confused.gif", "\uD83D\uDE15");
28+
smilies.put("icon_cool.gif", "\uD83D\uDE0A");
29+
smilies.put("icon_evil.gif", "\uD83D\uDE21");
30+
smilies.put("icon_biggrin.gif", "\uD83D\uDE03");
31+
smilies.put("icon_idea.gif", "\uD83D\uDCA1");
32+
smilies.put("icon_redface.gif", "\uD83D\uDE33");
33+
smilies.put("icon_razz.gif", "\uD83D\uDE1D");
34+
smilies.put("icon_rolleyes.gif", "\uD83D\uDE0F");
35+
smilies.put("icon_wink.gif", "\uD83D\uDE09");
36+
smilies.put("icon_cry.gif", "\uD83D\uDE22");
37+
smilies.put("icon_surprised.gif", "\uD83D\uDE32");
38+
smilies.put("icon_lol.gif", "\uD83D\uDE03");
39+
smilies.put("icon_mad.gif", "\uD83D\uDE21");
40+
smilies.put("icon_sad.gif", "\uD83D\uDE1E");
41+
smilies.put("icon_exclaim.gif", "\u2757");
42+
smilies.put("icon_question.gif", "\u2753");
4743

4844
WP_SMILIES = Collections.unmodifiableMap(smilies);
4945

50-
WP_SMILIES_CODE_POINT_TO_TEXT = new SparseArray<String>(20);
46+
WP_SMILIES_CODE_POINT_TO_TEXT = new SparseArray<>(20);
5147
WP_SMILIES_CODE_POINT_TO_TEXT.put(10145, ":arrow:");
5248
WP_SMILIES_CODE_POINT_TO_TEXT.put(128161, ":idea:");
5349
WP_SMILIES_CODE_POINT_TO_TEXT.put(128512, ":mrgreen:");

‎WordPressUtils/src/main/java/org/wordpress/android/util/MediaUtils.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
package org.wordpress.android.util;
22

3-
import android.annotation.TargetApi;
43
import android.content.ContentUris;
54
import android.content.Context;
65
import android.content.CursorLoader;
76
import android.database.Cursor;
87
import android.graphics.BitmapFactory;
98
import android.net.Uri;
10-
import android.os.Build;
119
import android.os.Environment;
1210
import android.provider.DocumentsContract;
1311
import android.provider.MediaStore;
@@ -451,12 +449,9 @@ private static String getPath(final Context context, final Uri uri) {
451449
return null;
452450
}
453451

454-
@TargetApi(Build.VERSION_CODES.KITKAT)
455452
private static String getDocumentProviderPathKitkatOrHigher(final Context context, final Uri uri) {
456-
final boolean isKitKat = Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT;
457-
458453
// DocumentProvider
459-
if (isKitKat && DocumentsContract.isDocumentUri(context, uri)) {
454+
if (DocumentsContract.isDocumentUri(context, uri)) {
460455
// ExternalStorageProvider
461456
if (isExternalStorageDocument(uri)) {
462457
final String docId = DocumentsContract.getDocumentId(uri);

‎WordPressUtils/src/main/java/org/wordpress/android/util/NetworkUtils.java

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
11
package org.wordpress.android.util;
22

33
import android.annotation.SuppressLint;
4-
import android.annotation.TargetApi;
54
import android.content.Context;
65
import android.net.ConnectivityManager;
76
import android.net.NetworkInfo;
8-
import android.os.Build;
9-
import android.os.Build.VERSION_CODES;
107
import android.provider.Settings;
118

129
/**
@@ -71,16 +68,11 @@ public static boolean isMobileConnected(Context context) {
7168
/**
7269
* returns true if airplane mode has been enabled
7370
*/
74-
@TargetApi(VERSION_CODES.JELLY_BEAN_MR1)
7571
@SuppressWarnings("deprecation")
7672
public static boolean isAirplaneModeOn(Context context) {
7773
// prior to JellyBean 4.2 this was Settings.System.AIRPLANE_MODE_ON, JellyBean 4.2
7874
// moved it to Settings.Global
79-
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN_MR1) {
80-
return Settings.System.getInt(context.getContentResolver(), Settings.System.AIRPLANE_MODE_ON, 0) != 0;
81-
} else {
82-
return Settings.Global.getInt(context.getContentResolver(), Settings.Global.AIRPLANE_MODE_ON, 0) != 0;
83-
}
75+
return Settings.Global.getInt(context.getContentResolver(), Settings.Global.AIRPLANE_MODE_ON, 0) != 0;
8476
}
8577

8678
/**

‎WordPressUtils/src/main/java/org/wordpress/android/util/ViewUtils.java

Lines changed: 8 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
package org.wordpress.android.util;
22

3-
import android.annotation.TargetApi;
43
import android.content.Context;
54
import android.content.res.ColorStateList;
65
import android.content.res.TypedArray;
76
import android.graphics.Outline;
8-
import android.os.Build;
97
import android.view.View;
108
import android.view.ViewOutlineProvider;
119

@@ -20,16 +18,11 @@ public class ViewUtils {
2018
/**
2119
* Generate a value suitable for use in {@link View#setId(int)}.
2220
* This value will not collide with ID values generated at build time by aapt for R.id.
23-
* Uses the native implementation if API 17 or above, otherwise uses a copied implementation.
2421
*
2522
* @return a generated ID value
2623
*/
2724
public static int generateViewId() {
28-
if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.JELLY_BEAN_MR1) {
29-
return View.generateViewId();
30-
} else {
31-
return copiedGenerateViewId();
32-
}
25+
return View.generateViewId();
3326
}
3427

3528
private static final AtomicInteger NEXT_GENERATED_ID = new AtomicInteger(1);
@@ -64,18 +57,15 @@ public static void setButtonBackgroundColor(Context context, View button, @Style
6457
}
6558

6659
/**
67-
* adds an inset circular shadow outline the passed view (Lollipop+ only) - note that
60+
* adds an inset circular shadow outline the passed view - note that
6861
* the view should have its elevation set prior to calling this
6962
*/
70-
@TargetApi(Build.VERSION_CODES.LOLLIPOP)
7163
public static void addCircularShadowOutline(@NonNull View view) {
72-
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
73-
view.setOutlineProvider(new ViewOutlineProvider() {
74-
@Override
75-
public void getOutline(View view, Outline outline) {
76-
outline.setOval(0, 0, view.getWidth(), view.getHeight());
77-
}
78-
});
79-
}
64+
view.setOutlineProvider(new ViewOutlineProvider() {
65+
@Override
66+
public void getOutline(View view, Outline outline) {
67+
outline.setOval(0, 0, view.getWidth(), view.getHeight());
68+
}
69+
});
8070
}
8171
}

‎WordPressUtils/src/main/java/org/wordpress/android/util/WebViewUtils.java

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package org.wordpress.android.util;
22

3-
import android.os.Build;
43
import android.webkit.CookieManager;
54
import android.webkit.ValueCallback;
65

@@ -11,12 +10,6 @@ public static void clearCookiesAsync() {
1110

1211
public static void clearCookiesAsync(ValueCallback<Boolean> callback) {
1312
CookieManager cookieManager = CookieManager.getInstance();
14-
15-
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
16-
cookieManager.removeAllCookies(callback);
17-
} else {
18-
//noinspection deprecation
19-
cookieManager.removeAllCookie();
20-
}
13+
cookieManager.removeAllCookies(callback);
2114
}
2215
}

‎WordPressUtils/src/main/res/values/dimens.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<resources>
2+
<resources xmlns:tools="http://schemas.android.com/tools">
33
<dimen name="textinputlayout_baseline_correction">2dp</dimen>
4-
<dimen name="textinputlayout_correction_padding">4.3dp</dimen>
5-
<dimen name="textinputlayout_correction_margin_right">-8.6dp</dimen>
4+
<dimen name="textinputlayout_correction_padding" tools:ignore="UnusedResources">4.3dp</dimen>
5+
<dimen name="textinputlayout_correction_margin_right" tools:ignore="UnusedResources">-8.6dp</dimen>
66
</resources>

‎gradle/wrapper/gradle-wrapper.jar

333 Bytes
Binary file not shown.

‎gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)