Skip to content

Commit 35c8d31

Browse files
committed
update gradle and gradle plugin
1 parent 417afe6 commit 35c8d31

File tree

6 files changed

+10
-16
lines changed

6 files changed

+10
-16
lines changed

build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ buildscript {
66
mavenCentral()
77
}
88
dependencies {
9-
classpath 'com.android.tools.build:gradle:7.4.2'
9+
classpath 'com.android.tools.build:gradle:8.1.2'
1010
}
1111
}
1212

gradle.properties

+3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
android.useAndroidX=true
22
android.enableJetifier=true
3+
android.defaults.buildfeatures.buildconfig=true
4+
android.nonTransitiveRClass=true
5+
android.nonFinalResIds=false
36
org.gradle.jvmargs=-Xmx4096m

gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ 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-7.5-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip

src/main/java/eu/siacs/conversations/services/XmppConnectionService.java

+3-10
Original file line numberDiff line numberDiff line change
@@ -1538,16 +1538,9 @@ public void scheduleWakeUpCall(final int seconds, final int requestCode) {
15381538
final Intent intent = new Intent(this, EventReceiver.class);
15391539
intent.setAction(ACTION_PING);
15401540
try {
1541-
final PendingIntent pendingIntent;
1542-
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
1543-
pendingIntent =
1544-
PendingIntent.getBroadcast(
1545-
this, requestCode, intent, PendingIntent.FLAG_IMMUTABLE);
1546-
} else {
1547-
pendingIntent =
1548-
PendingIntent.getBroadcast(
1549-
this, requestCode, intent, 0);
1550-
}
1541+
final PendingIntent pendingIntent =
1542+
PendingIntent.getBroadcast(
1543+
this, requestCode, intent, PendingIntent.FLAG_IMMUTABLE);
15511544
alarmManager.set(AlarmManager.ELAPSED_REALTIME_WAKEUP, timeToWake, pendingIntent);
15521545
} catch (RuntimeException e) {
15531546
Log.e(Config.LOGTAG, "unable to schedule alarm for ping", e);

src/main/java/eu/siacs/conversations/ui/forms/FormFieldWrapper.java

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

1010
import java.util.List;
1111

12-
import eu.siacs.conversations.R;
1312
import eu.siacs.conversations.ui.util.StyledAttributes;
1413
import eu.siacs.conversations.xmpp.forms.Field;
1514

@@ -58,7 +57,7 @@ protected SpannableString createSpannableLabelString(String label, boolean requi
5857
int start = label.length();
5958
int end = label.length() + 2;
6059
spannableString.setSpan(new StyleSpan(android.graphics.Typeface.BOLD), start, end, 0);
61-
spannableString.setSpan(new ForegroundColorSpan(StyledAttributes.getColor(context,R.attr.colorAccent)), start, end, 0);
60+
spannableString.setSpan(new ForegroundColorSpan(StyledAttributes.getColor(context, androidx.appcompat.R.attr.colorAccent)), start, end, 0);
6261
}
6362
return spannableString;
6463
}

src/main/java/eu/siacs/conversations/ui/widget/SwipeRefreshListFragment.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
import androidx.fragment.app.ListFragment;
2727
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
2828

29-
import eu.siacs.conversations.R;
3029
import eu.siacs.conversations.ui.util.StyledAttributes;
3130

3231
/**
@@ -57,7 +56,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
5756

5857
final Context context = getActivity();
5958
if (context != null) {
60-
mSwipeRefreshLayout.setColorSchemeColors(StyledAttributes.getColor(context, R.attr.colorAccent));
59+
mSwipeRefreshLayout.setColorSchemeColors(StyledAttributes.getColor(context, androidx.appcompat.R.attr.colorAccent));
6160
}
6261

6362
if (onRefreshListener != null) {

0 commit comments

Comments
 (0)