narayana/conversations-classic
3
2
Fork 0
Code Issues 3 Pull requests 2 Actions Packages Projects Releases 4 Wiki Activity

update gradle and gradle plugin

Browse source
This commit is contained in:
Daniel Gultsch 2023-10-20 18:18:15 +02:00
parent 417afe6eb1
commit 35c8d31d42
No known key found for this signature in database
GPG key ID: F43D18AD2A0982C2
6 changed files with 10 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build.gradle
View file

@ -6,7 +6,7 @@ buildscript {
mavenCentral() mavenCentral()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:7.4.2' classpath 'com.android.tools.build:gradle:8.1.2'
} }
} }

3
gradle.properties
View file

@ -1,3 +1,6 @@
android.useAndroidX=true android.useAndroidX=true
android.enableJetifier=true android.enableJetifier=true
android.defaults.buildfeatures.buildconfig=true
android.nonTransitiveRClass=true
android.nonFinalResIds=false
org.gradle.jvmargs=-Xmx4096m org.gradle.jvmargs=-Xmx4096m

2
gradle/wrapper/gradle-wrapper.properties vendored
View file

@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip

9
src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
View file

@ -1538,16 +1538,9 @@ public class XmppConnectionService extends Service {
final Intent intent = new Intent(this, EventReceiver.class); final Intent intent = new Intent(this, EventReceiver.class);
intent.setAction(ACTION_PING); intent.setAction(ACTION_PING);
try { try {
final PendingIntent pendingIntent; final PendingIntent pendingIntent =
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
pendingIntent =
PendingIntent.getBroadcast( PendingIntent.getBroadcast(
this, requestCode, intent, PendingIntent.FLAG_IMMUTABLE); this, requestCode, intent, PendingIntent.FLAG_IMMUTABLE);
} else {
pendingIntent =
PendingIntent.getBroadcast(
this, requestCode, intent, 0);
}
alarmManager.set(AlarmManager.ELAPSED_REALTIME_WAKEUP, timeToWake, pendingIntent); alarmManager.set(AlarmManager.ELAPSED_REALTIME_WAKEUP, timeToWake, pendingIntent);
} catch (RuntimeException e) { } catch (RuntimeException e) {
Log.e(Config.LOGTAG, "unable to schedule alarm for ping", e); Log.e(Config.LOGTAG, "unable to schedule alarm for ping", e);

3
src/main/java/eu/siacs/conversations/ui/forms/FormFieldWrapper.java
View file

@ -9,7 +9,6 @@ import android.view.View;
import java.util.List; import java.util.List;
import eu.siacs.conversations.R;
import eu.siacs.conversations.ui.util.StyledAttributes; import eu.siacs.conversations.ui.util.StyledAttributes;
import eu.siacs.conversations.xmpp.forms.Field; import eu.siacs.conversations.xmpp.forms.Field;
@ -58,7 +57,7 @@ public abstract class FormFieldWrapper {
int start = label.length(); int start = label.length();
int end = label.length() + 2; int end = label.length() + 2;
spannableString.setSpan(new StyleSpan(android.graphics.Typeface.BOLD), start, end, 0); spannableString.setSpan(new StyleSpan(android.graphics.Typeface.BOLD), start, end, 0);
spannableString.setSpan(new ForegroundColorSpan(StyledAttributes.getColor(context,R.attr.colorAccent)), start, end, 0); spannableString.setSpan(new ForegroundColorSpan(StyledAttributes.getColor(context, androidx.appcompat.R.attr.colorAccent)), start, end, 0);
} }
return spannableString; return spannableString;
} }

3
src/main/java/eu/siacs/conversations/ui/widget/SwipeRefreshListFragment.java
View file

@ -26,7 +26,6 @@ import android.widget.ListView;
import androidx.fragment.app.ListFragment; import androidx.fragment.app.ListFragment;
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
import eu.siacs.conversations.R;
import eu.siacs.conversations.ui.util.StyledAttributes; import eu.siacs.conversations.ui.util.StyledAttributes;
/** /**
@ -57,7 +56,7 @@ public class SwipeRefreshListFragment extends ListFragment {
final Context context = getActivity(); final Context context = getActivity();
if (context != null) { if (context != null) {
mSwipeRefreshLayout.setColorSchemeColors(StyledAttributes.getColor(context, R.attr.colorAccent)); mSwipeRefreshLayout.setColorSchemeColors(StyledAttributes.getColor(context, androidx.appcompat.R.attr.colorAccent));
} }
if (onRefreshListener != null) { if (onRefreshListener != null) {