mirror of
https://codeberg.org/Freeyourgadget/Gadgetbridge
synced 2024-07-27 17:14:55 +02:00
Upgrade to gradle 8
This commit is contained in:
parent
f2d935bfc1
commit
9bff990370
|
@ -1,14 +1,8 @@
|
||||||
import com.github.spotbugs.SpotBugsTask
|
|
||||||
|
|
||||||
import java.nio.file.Files
|
import java.nio.file.Files
|
||||||
|
|
||||||
apply plugin: "com.android.application"
|
apply plugin: "com.android.application"
|
||||||
apply plugin: "com.github.spotbugs"
|
|
||||||
apply plugin: "pmd"
|
|
||||||
apply plugin: 'com.google.protobuf'
|
apply plugin: 'com.google.protobuf'
|
||||||
|
|
||||||
def ABORT_ON_CHECK_FAILURE = true
|
|
||||||
|
|
||||||
tasks.withType(Test) {
|
tasks.withType(Test) {
|
||||||
systemProperty "MiFirmwareDir", System.getProperty("MiFirmwareDir", null)
|
systemProperty "MiFirmwareDir", System.getProperty("MiFirmwareDir", null)
|
||||||
systemProperty "logback.configurationFile", System.getProperty("user.dir", null) + "/app/src/main/assets/logback.xml"
|
systemProperty "logback.configurationFile", System.getProperty("user.dir", null) + "/app/src/main/assets/logback.xml"
|
||||||
|
@ -147,7 +141,7 @@ android {
|
||||||
versionNameSuffix "-${getGitHashShort}"
|
versionNameSuffix "-${getGitHashShort}"
|
||||||
proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
|
proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
|
||||||
minifyEnabled true
|
minifyEnabled true
|
||||||
debuggable true
|
debuggable false
|
||||||
|
|
||||||
if (System.getProperty("nightly_store_file") != null) {
|
if (System.getProperty("nightly_store_file") != null) {
|
||||||
signingConfig signingConfigs.nightly
|
signingConfig signingConfigs.nightly
|
||||||
|
@ -161,7 +155,7 @@ android {
|
||||||
versionNameSuffix "-${getGitHashShort}"
|
versionNameSuffix "-${getGitHashShort}"
|
||||||
proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
|
proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
|
||||||
minifyEnabled true
|
minifyEnabled true
|
||||||
debuggable true
|
debuggable false
|
||||||
|
|
||||||
if (System.getProperty("nightly_store_file") != null) {
|
if (System.getProperty("nightly_store_file") != null) {
|
||||||
signingConfig signingConfigs.nightly
|
signingConfig signingConfigs.nightly
|
||||||
|
@ -186,7 +180,7 @@ android {
|
||||||
}
|
}
|
||||||
|
|
||||||
lint {
|
lint {
|
||||||
abortOnError ABORT_ON_CHECK_FAILURE
|
abortOnError true
|
||||||
lintConfig file("$rootDir/app/src/main/lint.xml")
|
lintConfig file("$rootDir/app/src/main/lint.xml")
|
||||||
// If true, generate an HTML report (with issue explanations, sourcecode, etc)
|
// If true, generate an HTML report (with issue explanations, sourcecode, etc)
|
||||||
htmlReport true
|
htmlReport true
|
||||||
|
@ -202,10 +196,10 @@ android {
|
||||||
includeAndroidResources = true
|
includeAndroidResources = true
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
buildFeatures {
|
||||||
|
aidl true
|
||||||
pmd {
|
buildConfig true
|
||||||
toolVersion = "5.5.5"
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
|
@ -291,49 +285,6 @@ gradle.beforeProject {
|
||||||
preBuild.dependsOn(":GBDaoGenerator:genSources")
|
preBuild.dependsOn(":GBDaoGenerator:genSources")
|
||||||
}
|
}
|
||||||
|
|
||||||
check.dependsOn "spotbugsMain", "pmd", "lint"
|
|
||||||
|
|
||||||
task pmd(type: Pmd) {
|
|
||||||
ruleSetFiles = files("${project.rootDir}/config/pmd/pmd-ruleset.xml")
|
|
||||||
ignoreFailures = !ABORT_ON_CHECK_FAILURE
|
|
||||||
ruleSets = [
|
|
||||||
"java-android",
|
|
||||||
"java-basic",
|
|
||||||
"java-braces",
|
|
||||||
"java-clone",
|
|
||||||
"java-codesize",
|
|
||||||
"java-controversial",
|
|
||||||
"java-coupling",
|
|
||||||
"java-design",
|
|
||||||
"java-empty",
|
|
||||||
"java-finalizers",
|
|
||||||
"java-imports",
|
|
||||||
"java-junit",
|
|
||||||
"java-optimizations",
|
|
||||||
"java-strictexception",
|
|
||||||
"java-strings",
|
|
||||||
"java-sunsecure",
|
|
||||||
"java-typeresolution",
|
|
||||||
"java-unnecessary",
|
|
||||||
"java-unusedcode"
|
|
||||||
]
|
|
||||||
|
|
||||||
source "src"
|
|
||||||
include "**/*.java"
|
|
||||||
exclude "**/gen/**"
|
|
||||||
|
|
||||||
reports {
|
|
||||||
xml.enabled = false
|
|
||||||
html.enabled = true
|
|
||||||
xml {
|
|
||||||
destination file("$project.buildDir/reports/pmd/pmd.xml")
|
|
||||||
}
|
|
||||||
html {
|
|
||||||
destination file("$project.buildDir/reports/pmd/pmd.html")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
sourceSets {
|
sourceSets {
|
||||||
main {
|
main {
|
||||||
java.srcDirs += "${protobuf.generatedFilesBaseDir}"
|
java.srcDirs += "${protobuf.generatedFilesBaseDir}"
|
||||||
|
@ -341,30 +292,7 @@ sourceSets {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
spotbugs {
|
tasks.register('cleanGenerated', Delete) {
|
||||||
toolVersion = "3.1.12"
|
|
||||||
ignoreFailures = !ABORT_ON_CHECK_FAILURE
|
|
||||||
effort = "default"
|
|
||||||
reportLevel = "medium"
|
|
||||||
}
|
|
||||||
|
|
||||||
tasks.withType(SpotBugsTask) {
|
|
||||||
source = fileTree('src/main/java')
|
|
||||||
classes = files("${project.rootDir}/app/build/intermediates/javac/debug/classes")
|
|
||||||
excludeFilter = new File("${project.rootDir}/config/findbugs/findbugs-filter.xml")
|
|
||||||
reports {
|
|
||||||
xml.enabled = false
|
|
||||||
html.enabled = true
|
|
||||||
xml {
|
|
||||||
destination file("$project.buildDir/reports/spotbugs/spotbugs-output.xml")
|
|
||||||
}
|
|
||||||
html {
|
|
||||||
destination file("$project.buildDir/reports/spotbugs/spotbugs-output.html")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
task cleanGenerated(type: Delete) {
|
|
||||||
delete fileTree('src/main/java/nodomain/freeyourgadget/gadgetbridge/entities') {
|
delete fileTree('src/main/java/nodomain/freeyourgadget/gadgetbridge/entities') {
|
||||||
include '**/*.java'
|
include '**/*.java'
|
||||||
exclude '**/Abstract*.java'
|
exclude '**/Abstract*.java'
|
||||||
|
|
9
app/proguard-rules.pro
vendored
9
app/proguard-rules.pro
vendored
|
@ -34,6 +34,9 @@
|
||||||
}
|
}
|
||||||
-keepattributes JavascriptInterface
|
-keepattributes JavascriptInterface
|
||||||
|
|
||||||
|
# Keep coordinators, they're only referenced from DeviceType
|
||||||
|
-keep public class * implements nodomain.freeyourgadget.gadgetbridge.devices.DeviceCoordinator
|
||||||
|
|
||||||
# Keep parseIncoming for GFDIMessage classes, as it is called by reflection in GFDIMessage#parseIncoming
|
# Keep parseIncoming for GFDIMessage classes, as it is called by reflection in GFDIMessage#parseIncoming
|
||||||
-keep public class * extends nodomain.freeyourgadget.gadgetbridge.service.devices.garmin.messages.GFDIMessage
|
-keep public class * extends nodomain.freeyourgadget.gadgetbridge.service.devices.garmin.messages.GFDIMessage
|
||||||
-keepclassmembers class * extends nodomain.freeyourgadget.gadgetbridge.service.devices.garmin.messages.GFDIMessage {
|
-keepclassmembers class * extends nodomain.freeyourgadget.gadgetbridge.service.devices.garmin.messages.GFDIMessage {
|
||||||
|
@ -63,6 +66,10 @@
|
||||||
|
|
||||||
# Keep dependency android-emojify (io.wax911.emojify) uses
|
# Keep dependency android-emojify (io.wax911.emojify) uses
|
||||||
-keep class org.hamcrest.** { *; }
|
-keep class org.hamcrest.** { *; }
|
||||||
|
-dontwarn java.beans.BeanInfo
|
||||||
|
-dontwarn java.beans.IntrospectionException
|
||||||
|
-dontwarn java.beans.Introspector
|
||||||
|
-dontwarn java.beans.PropertyDescriptor
|
||||||
|
|
||||||
# Keep logback classes
|
# Keep logback classes
|
||||||
-keep class ch.qos.** { *; }
|
-keep class ch.qos.** { *; }
|
||||||
|
@ -72,6 +79,8 @@
|
||||||
-keepclassmembers,allowobfuscation class * {
|
-keepclassmembers,allowobfuscation class * {
|
||||||
@com.google.gson.annotations.SerializedName <fields>;
|
@com.google.gson.annotations.SerializedName <fields>;
|
||||||
}
|
}
|
||||||
|
# Somehow the rule above was not enough for some
|
||||||
|
-keep class nodomain.freeyourgadget.gadgetbridge.devices.pinetime.InfiniTimeDFU* { *; }
|
||||||
|
|
||||||
# Keep generated protobuf classes
|
# Keep generated protobuf classes
|
||||||
-keep class nodomain.freeyourgadget.gadgetbridge.proto.** { *; }
|
-keep class nodomain.freeyourgadget.gadgetbridge.proto.** { *; }
|
||||||
|
|
|
@ -222,7 +222,7 @@ public class ControlCenterv2 extends AppCompatActivity
|
||||||
if (GBApplication.areDynamicColorsEnabled()) {
|
if (GBApplication.areDynamicColorsEnabled()) {
|
||||||
TypedValue typedValue = new TypedValue();
|
TypedValue typedValue = new TypedValue();
|
||||||
Resources.Theme theme = getTheme();
|
Resources.Theme theme = getTheme();
|
||||||
theme.resolveAttribute(R.attr.colorSurface, typedValue, true);
|
theme.resolveAttribute(com.google.android.material.R.attr.colorSurface, typedValue, true);
|
||||||
@ColorInt int toolbarBackground = typedValue.data;
|
@ColorInt int toolbarBackground = typedValue.data;
|
||||||
toolbar.setBackgroundColor(toolbarBackground);
|
toolbar.setBackgroundColor(toolbarBackground);
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -269,16 +269,14 @@ public abstract class AbstractChartsActivity extends AbstractGBFragmentActivity
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean onOptionsItemSelected(MenuItem item) {
|
public boolean onOptionsItemSelected(MenuItem item) {
|
||||||
switch (item.getItemId()) {
|
final int itemId = item.getItemId();
|
||||||
case R.id.charts_fetch_activity_data:
|
if (itemId == R.id.charts_fetch_activity_data) {
|
||||||
fetchRecordedData();
|
fetchRecordedData();
|
||||||
return true;
|
return true;
|
||||||
case R.id.prefs_charts_menu:
|
} else if (itemId == R.id.prefs_charts_menu) {
|
||||||
Intent settingsIntent = new Intent(this, ChartsPreferencesActivity.class);
|
Intent settingsIntent = new Intent(this, ChartsPreferencesActivity.class);
|
||||||
startActivityForResult(settingsIntent, REQUEST_CODE_PREFERENCES);
|
startActivityForResult(settingsIntent, REQUEST_CODE_PREFERENCES);
|
||||||
return true;
|
return true;
|
||||||
default:
|
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return super.onOptionsItemSelected(item);
|
return super.onOptionsItemSelected(item);
|
||||||
|
|
|
@ -79,7 +79,6 @@ import nodomain.freeyourgadget.gadgetbridge.model.Spo2Sample;
|
||||||
import nodomain.freeyourgadget.gadgetbridge.model.StressSample;
|
import nodomain.freeyourgadget.gadgetbridge.model.StressSample;
|
||||||
import nodomain.freeyourgadget.gadgetbridge.model.TemperatureSample;
|
import nodomain.freeyourgadget.gadgetbridge.model.TemperatureSample;
|
||||||
import nodomain.freeyourgadget.gadgetbridge.service.ServiceDeviceSupport;
|
import nodomain.freeyourgadget.gadgetbridge.service.ServiceDeviceSupport;
|
||||||
import nodomain.freeyourgadget.gadgetbridge.service.SleepAsAndroidSender;
|
|
||||||
import nodomain.freeyourgadget.gadgetbridge.util.FileUtils;
|
import nodomain.freeyourgadget.gadgetbridge.util.FileUtils;
|
||||||
import nodomain.freeyourgadget.gadgetbridge.util.GBPrefs;
|
import nodomain.freeyourgadget.gadgetbridge.util.GBPrefs;
|
||||||
import nodomain.freeyourgadget.gadgetbridge.util.Prefs;
|
import nodomain.freeyourgadget.gadgetbridge.util.Prefs;
|
||||||
|
@ -107,7 +106,7 @@ public abstract class AbstractDeviceCoordinator implements DeviceCoordinator {
|
||||||
supportedDeviceName = getSupportedDeviceName();
|
supportedDeviceName = getSupportedDeviceName();
|
||||||
}
|
}
|
||||||
if (supportedDeviceName == null) {
|
if (supportedDeviceName == null) {
|
||||||
LOG.error(getClass() + " should either override getSupportedDeviceName or supports(GBDeviceCandidate)");
|
LOG.error("{} should either override getSupportedDeviceName or supports(GBDeviceCandidate)", getClass());
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -142,7 +141,7 @@ public abstract class AbstractDeviceCoordinator implements DeviceCoordinator {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public final void deleteDevice(final GBDevice gbDevice) throws GBException {
|
public final void deleteDevice(final GBDevice gbDevice) throws GBException {
|
||||||
LOG.info("will try to delete device: " + gbDevice.getName());
|
LOG.info("will try to delete device: {}", gbDevice.getName());
|
||||||
if (gbDevice.isConnected() || gbDevice.isConnecting()) {
|
if (gbDevice.isConnected() || gbDevice.isConnecting()) {
|
||||||
GBApplication.deviceService(gbDevice).disconnect();
|
GBApplication.deviceService(gbDevice).disconnect();
|
||||||
}
|
}
|
||||||
|
@ -177,7 +176,7 @@ public abstract class AbstractDeviceCoordinator implements DeviceCoordinator {
|
||||||
alarmDeviceQueryBuilder.where(AlarmDao.Properties.DeviceId.eq(device.getId())).buildDelete().executeDeleteWithoutDetachingEntities();
|
alarmDeviceQueryBuilder.where(AlarmDao.Properties.DeviceId.eq(device.getId())).buildDelete().executeDeleteWithoutDetachingEntities();
|
||||||
session.getDeviceDao().delete(device);
|
session.getDeviceDao().delete(device);
|
||||||
} else {
|
} else {
|
||||||
LOG.info("device to delete not found in db: " + gbDevice);
|
LOG.info("device to delete not found in db: {}", gbDevice);
|
||||||
}
|
}
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
throw new GBException("Error deleting device: " + e.getMessage(), e);
|
throw new GBException("Error deleting device: " + e.getMessage(), e);
|
||||||
|
@ -190,7 +189,7 @@ public abstract class AbstractDeviceCoordinator implements DeviceCoordinator {
|
||||||
* @param gbDevice the GBDevice
|
* @param gbDevice the GBDevice
|
||||||
* @param device the corresponding database Device
|
* @param device the corresponding database Device
|
||||||
* @param session the session to use
|
* @param session the session to use
|
||||||
* @throws GBException
|
* @throws GBException if there was an error deleting device-specific resources
|
||||||
*/
|
*/
|
||||||
protected abstract void deleteDevice(@NonNull GBDevice gbDevice, @NonNull Device device, @NonNull DaoSession session) throws GBException;
|
protected abstract void deleteDevice(@NonNull GBDevice gbDevice, @NonNull Device device, @NonNull DaoSession session) throws GBException;
|
||||||
|
|
||||||
|
@ -273,7 +272,7 @@ public abstract class AbstractDeviceCoordinator implements DeviceCoordinator {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
if (bluetoothClass == null) {
|
if (bluetoothClass == null) {
|
||||||
LOG.warn("unable to determine bluetooth device class of " + device);
|
LOG.warn("unable to determine bluetooth device class of {}", device);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
if (bluetoothClass.getMajorDeviceClass() == BluetoothClass.Device.Major.WEARABLE
|
if (bluetoothClass.getMajorDeviceClass() == BluetoothClass.Device.Major.WEARABLE
|
||||||
|
|
|
@ -55,6 +55,7 @@ public class BFH16DeviceCoordinator extends AbstractBLEDeviceCoordinator
|
||||||
return "Denver";
|
return "Denver";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@NonNull
|
||||||
@Override
|
@Override
|
||||||
public Collection<? extends ScanFilter> createBLEScanFilters() {
|
public Collection<? extends ScanFilter> createBLEScanFilters() {
|
||||||
|
|
||||||
|
|
|
@ -101,7 +101,7 @@ public class MiBandCoordinator extends AbstractBLEDeviceCoordinator {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void deleteDevice(GBDevice gbDevice, Device device, DaoSession session) throws GBException {
|
protected void deleteDevice(@NonNull GBDevice gbDevice, @NonNull Device device, @NonNull DaoSession session) throws GBException {
|
||||||
Long deviceId = device.getId();
|
Long deviceId = device.getId();
|
||||||
QueryBuilder<?> qb = session.getMiBandActivitySampleDao().queryBuilder();
|
QueryBuilder<?> qb = session.getMiBandActivitySampleDao().queryBuilder();
|
||||||
qb.where(MiBandActivitySampleDao.Properties.DeviceId.eq(deviceId)).buildDelete().executeDeleteWithoutDetachingEntities();
|
qb.where(MiBandActivitySampleDao.Properties.DeviceId.eq(deviceId)).buildDelete().executeDeleteWithoutDetachingEntities();
|
||||||
|
|
|
@ -21,6 +21,9 @@ import com.google.gson.annotations.SerializedName;
|
||||||
import java.math.BigInteger;
|
import java.math.BigInteger;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* If this or any of the classes below are renamed, update the proguard rules.
|
||||||
|
*/
|
||||||
public class InfiniTimeDFUPackage {
|
public class InfiniTimeDFUPackage {
|
||||||
@SerializedName("manifest")
|
@SerializedName("manifest")
|
||||||
InfiniTimeDFUPackageManifest manifest;
|
InfiniTimeDFUPackageManifest manifest;
|
||||||
|
|
|
@ -52,7 +52,7 @@ public class VescCoordinator extends AbstractBLEDeviceCoordinator {
|
||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void deleteDevice(GBDevice gbDevice, Device device, DaoSession session) throws GBException {
|
protected void deleteDevice(@NonNull GBDevice gbDevice, @NonNull Device device, @NonNull DaoSession session) throws GBException {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -126,7 +126,7 @@ public class AndroidUtils {
|
||||||
} else {
|
} else {
|
||||||
dynamicColorContext = DynamicColors.wrapContextIfAvailable(context, R.style.GadgetbridgeThemeDynamicLight);
|
dynamicColorContext = DynamicColors.wrapContextIfAvailable(context, R.style.GadgetbridgeThemeDynamicLight);
|
||||||
}
|
}
|
||||||
int[] attrsToResolve = {R.attr.colorOnSurface};
|
int[] attrsToResolve = {com.google.android.material.R.attr.colorOnSurface};
|
||||||
@SuppressLint("ResourceType")
|
@SuppressLint("ResourceType")
|
||||||
TypedArray ta = dynamicColorContext.obtainStyledAttributes(attrsToResolve);
|
TypedArray ta = dynamicColorContext.obtainStyledAttributes(attrsToResolve);
|
||||||
color = ta.getColor(0, 0);
|
color = ta.getColor(0, 0);
|
||||||
|
@ -152,15 +152,15 @@ public class AndroidUtils {
|
||||||
} else {
|
} else {
|
||||||
dynamicColorContext = DynamicColors.wrapContextIfAvailable(context, R.style.GadgetbridgeThemeDynamicLight);
|
dynamicColorContext = DynamicColors.wrapContextIfAvailable(context, R.style.GadgetbridgeThemeDynamicLight);
|
||||||
}
|
}
|
||||||
int[] attrsToResolve = {R.attr.colorSurface};
|
int[] attrsToResolve = {com.google.android.material.R.attr.colorSurface};
|
||||||
@SuppressLint("ResourceType")
|
@SuppressLint("ResourceType")
|
||||||
TypedArray ta = dynamicColorContext.obtainStyledAttributes(attrsToResolve);
|
TypedArray ta = dynamicColorContext.obtainStyledAttributes(attrsToResolve);
|
||||||
color = ta.getColor(0, 0);
|
color = ta.getColor(0, 0);
|
||||||
ta.recycle();
|
ta.recycle();
|
||||||
} else if (GBApplication.isDarkThemeEnabled()) {
|
} else if (GBApplication.isDarkThemeEnabled()) {
|
||||||
color = context.getResources().getColor(R.color.cardview_dark_background);
|
color = context.getResources().getColor(androidx.cardview.R.color.cardview_dark_background);
|
||||||
} else {
|
} else {
|
||||||
color = context.getResources().getColor(R.color.cardview_light_background);
|
color = context.getResources().getColor(androidx.cardview.R.color.cardview_light_background);
|
||||||
}
|
}
|
||||||
return colorToHex(color);
|
return colorToHex(color);
|
||||||
}
|
}
|
||||||
|
@ -168,9 +168,9 @@ public class AndroidUtils {
|
||||||
public static int getBackgroundColor(Context context) {
|
public static int getBackgroundColor(Context context) {
|
||||||
int color;
|
int color;
|
||||||
if (GBApplication.isDarkThemeEnabled()) {
|
if (GBApplication.isDarkThemeEnabled()) {
|
||||||
color = context.getResources().getColor(R.color.cardview_dark_background);
|
color = context.getResources().getColor(androidx.cardview.R.color.cardview_dark_background);
|
||||||
} else {
|
} else {
|
||||||
color = context.getResources().getColor(R.color.cardview_light_background);
|
color = context.getResources().getColor(androidx.cardview.R.color.cardview_light_background);
|
||||||
}
|
}
|
||||||
return color;
|
return color;
|
||||||
}
|
}
|
||||||
|
|
|
@ -9,9 +9,8 @@ buildscript {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
dependencies {
|
dependencies {
|
||||||
classpath 'com.android.tools.build:gradle:7.4.2'
|
classpath 'com.android.tools.build:gradle:8.5.0'
|
||||||
|
|
||||||
classpath 'gradle.plugin.com.github.spotbugs:spotbugs-gradle-plugin:2.0.0'
|
|
||||||
classpath 'com.google.protobuf:protobuf-gradle-plugin:0.9.4'
|
classpath 'com.google.protobuf:protobuf-gradle-plugin:0.9.4'
|
||||||
// NOTE: Do not place your application dependencies here; they belong
|
// NOTE: Do not place your application dependencies here; they belong
|
||||||
// in the individual module build.gradle files
|
// in the individual module build.gradle files
|
||||||
|
|
|
@ -1,19 +0,0 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<FindBugsFilter>
|
|
||||||
<Match>
|
|
||||||
<!-- ignore all issues in resource generation -->
|
|
||||||
<Class name="~.*\.R\$.*"/>
|
|
||||||
</Match>
|
|
||||||
<Match>
|
|
||||||
<Class name="~.*\.Manifest\$.*"/>
|
|
||||||
</Match>
|
|
||||||
|
|
||||||
<!-- ignore all bugs in test classes, except for those bugs specifically relating to JUnit tests -->
|
|
||||||
<Match>
|
|
||||||
<Class name="~.*\.*Test" />
|
|
||||||
<!-- test classes are suffixed by 'Test' -->
|
|
||||||
<Not>
|
|
||||||
<Bug code="IJU" /> <!-- 'IJU' is the code for bugs related to JUnit test code -->
|
|
||||||
</Not>
|
|
||||||
</Match>
|
|
||||||
</FindBugsFilter>
|
|
|
@ -1,50 +0,0 @@
|
||||||
<?xml version="1.0"?>
|
|
||||||
<!--
|
|
||||||
~ Copyright 2015 Vincent Brison.
|
|
||||||
~
|
|
||||||
~ Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
~ you may not use this file except in compliance with the License.
|
|
||||||
~ You may obtain a copy of the License at
|
|
||||||
~
|
|
||||||
~ http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
~
|
|
||||||
~ Unless required by applicable law or agreed to in writing, software
|
|
||||||
~ distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
~ See the License for the specific language governing permissions and
|
|
||||||
~ limitations under the License.
|
|
||||||
-->
|
|
||||||
|
|
||||||
<ruleset xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Android Application Rules"
|
|
||||||
xmlns="http://pmd.sf.net/ruleset/1.0.0"
|
|
||||||
xsi:noNamespaceSchemaLocation="http://pmd.sf.net/ruleset_xml_schema.xsd"
|
|
||||||
xsi:schemaLocation="http://pmd.sf.net/ruleset/1.0.0 http://pmd.sf.net/ruleset_xml_schema.xsd">
|
|
||||||
|
|
||||||
<description>Custom ruleset for Android application</description>
|
|
||||||
|
|
||||||
<exclude-pattern>.*/R.java</exclude-pattern>
|
|
||||||
<exclude-pattern>.*/gen/.*</exclude-pattern>
|
|
||||||
|
|
||||||
<rule ref="rulesets/java/android.xml">
|
|
||||||
</rule>
|
|
||||||
<rule ref="rulesets/java/clone.xml" />
|
|
||||||
<rule ref="rulesets/java/finalizers.xml" />
|
|
||||||
<rule ref="rulesets/java/imports.xml">
|
|
||||||
<!-- Espresso is designed this way !-->
|
|
||||||
<exclude name="TooManyStaticImports" />
|
|
||||||
</rule>
|
|
||||||
<rule ref="rulesets/java/logging-java.xml">
|
|
||||||
<!-- disabled because of lots of NullPointerExceptions -->
|
|
||||||
<exclude name="InvalidSlf4jMessageFormat"/>
|
|
||||||
</rule>
|
|
||||||
<rule ref="rulesets/java/braces.xml" />
|
|
||||||
<rule ref="rulesets/java/strings.xml" />
|
|
||||||
<rule ref="rulesets/java/basic.xml" />
|
|
||||||
<rule ref="rulesets/java/naming.xml">
|
|
||||||
<exclude name="AbstractNaming" />
|
|
||||||
<exclude name="LongVariable" />
|
|
||||||
<exclude name="ShortMethodName" />
|
|
||||||
<exclude name="ShortVariable" />
|
|
||||||
<exclude name="VariableNamingConventions" />
|
|
||||||
</rule>
|
|
||||||
</ruleset>
|
|
|
@ -19,3 +19,9 @@ org.gradle.jvmargs=-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF
|
||||||
# org.gradle.parallel=true
|
# org.gradle.parallel=true
|
||||||
android.useAndroidX=true
|
android.useAndroidX=true
|
||||||
android.enableJetifier=true
|
android.enableJetifier=true
|
||||||
|
|
||||||
|
# FIXME: Migrate all switches to if statements
|
||||||
|
android.nonFinalResIds=false
|
||||||
|
|
||||||
|
# FIXME: This optimizes away some classes it should not - see #3853
|
||||||
|
android.enableR8.fullMode=false
|
||||||
|
|
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
Binary file not shown.
3
gradle/wrapper/gradle-wrapper.properties
vendored
3
gradle/wrapper/gradle-wrapper.properties
vendored
|
@ -1,5 +1,6 @@
|
||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
|
||||||
|
validateDistributionUrl=true
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
zipStorePath=wrapper/dists
|
zipStorePath=wrapper/dists
|
||||||
|
|
31
gradlew
vendored
31
gradlew
vendored
|
@ -55,7 +55,7 @@
|
||||||
# Darwin, MinGW, and NonStop.
|
# Darwin, MinGW, and NonStop.
|
||||||
#
|
#
|
||||||
# (3) This script is generated from the Groovy template
|
# (3) This script is generated from the Groovy template
|
||||||
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
|
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
|
||||||
# within the Gradle project.
|
# within the Gradle project.
|
||||||
#
|
#
|
||||||
# You can find Gradle at https://github.com/gradle/gradle/.
|
# You can find Gradle at https://github.com/gradle/gradle/.
|
||||||
|
@ -83,10 +83,8 @@ done
|
||||||
# This is normally unused
|
# This is normally unused
|
||||||
# shellcheck disable=SC2034
|
# shellcheck disable=SC2034
|
||||||
APP_BASE_NAME=${0##*/}
|
APP_BASE_NAME=${0##*/}
|
||||||
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
|
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
|
||||||
|
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
|
||||||
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
|
||||||
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
|
|
||||||
|
|
||||||
# Use the maximum available, or set MAX_FD != -1 to use that value.
|
# Use the maximum available, or set MAX_FD != -1 to use that value.
|
||||||
MAX_FD=maximum
|
MAX_FD=maximum
|
||||||
|
@ -133,10 +131,13 @@ location of your Java installation."
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
JAVACMD=java
|
JAVACMD=java
|
||||||
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
if ! command -v java >/dev/null 2>&1
|
||||||
|
then
|
||||||
|
die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
||||||
|
|
||||||
Please set the JAVA_HOME variable in your environment to match the
|
Please set the JAVA_HOME variable in your environment to match the
|
||||||
location of your Java installation."
|
location of your Java installation."
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Increase the maximum file descriptors if we can.
|
# Increase the maximum file descriptors if we can.
|
||||||
|
@ -144,7 +145,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
|
||||||
case $MAX_FD in #(
|
case $MAX_FD in #(
|
||||||
max*)
|
max*)
|
||||||
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
|
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
|
||||||
# shellcheck disable=SC3045
|
# shellcheck disable=SC2039,SC3045
|
||||||
MAX_FD=$( ulimit -H -n ) ||
|
MAX_FD=$( ulimit -H -n ) ||
|
||||||
warn "Could not query maximum file descriptor limit"
|
warn "Could not query maximum file descriptor limit"
|
||||||
esac
|
esac
|
||||||
|
@ -152,7 +153,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
|
||||||
'' | soft) :;; #(
|
'' | soft) :;; #(
|
||||||
*)
|
*)
|
||||||
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
|
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
|
||||||
# shellcheck disable=SC3045
|
# shellcheck disable=SC2039,SC3045
|
||||||
ulimit -n "$MAX_FD" ||
|
ulimit -n "$MAX_FD" ||
|
||||||
warn "Could not set maximum file descriptor limit to $MAX_FD"
|
warn "Could not set maximum file descriptor limit to $MAX_FD"
|
||||||
esac
|
esac
|
||||||
|
@ -197,11 +198,15 @@ if "$cygwin" || "$msys" ; then
|
||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Collect all arguments for the java command;
|
|
||||||
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
|
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
||||||
# shell script including quotes and variable substitutions, so put them in
|
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
|
||||||
# double quotes to make sure that they get re-expanded; and
|
|
||||||
# * put everything else in single quotes, so that it's not re-expanded.
|
# Collect all arguments for the java command:
|
||||||
|
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
|
||||||
|
# and any embedded shellness will be escaped.
|
||||||
|
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
|
||||||
|
# treated as '${Hostname}' itself on the command line.
|
||||||
|
|
||||||
set -- \
|
set -- \
|
||||||
"-Dorg.gradle.appname=$APP_BASE_NAME" \
|
"-Dorg.gradle.appname=$APP_BASE_NAME" \
|
||||||
|
|
20
gradlew.bat
vendored
20
gradlew.bat
vendored
|
@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
|
||||||
%JAVA_EXE% -version >NUL 2>&1
|
%JAVA_EXE% -version >NUL 2>&1
|
||||||
if %ERRORLEVEL% equ 0 goto execute
|
if %ERRORLEVEL% equ 0 goto execute
|
||||||
|
|
||||||
echo.
|
echo. 1>&2
|
||||||
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
|
||||||
echo.
|
echo. 1>&2
|
||||||
echo Please set the JAVA_HOME variable in your environment to match the
|
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
|
||||||
echo location of your Java installation.
|
echo location of your Java installation. 1>&2
|
||||||
|
|
||||||
goto fail
|
goto fail
|
||||||
|
|
||||||
|
@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
|
||||||
|
|
||||||
if exist "%JAVA_EXE%" goto execute
|
if exist "%JAVA_EXE%" goto execute
|
||||||
|
|
||||||
echo.
|
echo. 1>&2
|
||||||
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
|
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
|
||||||
echo.
|
echo. 1>&2
|
||||||
echo Please set the JAVA_HOME variable in your environment to match the
|
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
|
||||||
echo location of your Java installation.
|
echo location of your Java installation. 1>&2
|
||||||
|
|
||||||
goto fail
|
goto fail
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user