mirror of
https://github.com/syncthing/syncthing-android.git
synced 2024-11-23 04:41:16 +00:00
1e9cd95913
Bumps [com.google.guava:guava](https://github.com/google/guava) from 31.1-android to 32.1.2-android. <details> <summary>Release notes</summary> <p><em>Sourced from <a href="https://github.com/google/guava/releases">com.google.guava:guava's releases</a>.</em></p> <blockquote> <h2>32.1.2</h2> <h3>Maven</h3> <pre lang="xml"><code><dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> <version>32.1.2-jre</version> <!-- or, for Android: --> <version>32.1.2-android</version> </dependency> </code></pre> <h3>Jar files</h3> <ul> <li><a href="https://repo1.maven.org/maven2/com/google/guava/guava/32.1.2-jre/guava-32.1.2-jre.jar">32.1.2-jre.jar</a></li> <li><a href="https://repo1.maven.org/maven2/com/google/guava/guava/32.1.2-android/guava-32.1.2-android.jar">32.1.2-android.jar</a></li> </ul> <p>Guava requires <a href="https://github.com/google/guava/wiki/UseGuavaInYourBuild#what-about-guavas-own-dependencies">one runtime dependency</a>, which you can download here:</p> <ul> <li><a href="https://repo1.maven.org/maven2/com/google/guava/failureaccess/1.0.1/failureaccess-1.0.1.jar">failureaccess-1.0.1.jar</a></li> </ul> <h3>Javadoc</h3> <ul> <li><a href="http://guava.dev/releases/32.1.2-jre/api/docs/">32.1.2-jre</a></li> <li><a href="http://guava.dev/releases/32.1.2-android/api/docs/">32.1.2-android</a></li> </ul> <h3>JDiff</h3> <ul> <li><a href="http://guava.dev/releases/32.1.2-jre/api/diffs/">32.1.2-jre vs. 32.1.1-jre</a></li> <li><a href="http://guava.dev/releases/32.1.2-android/api/diffs/">32.1.2-android vs. 32.1.1-android</a></li> <li><a href="http://guava.dev/releases/32.1.2-android/api/androiddiffs/">32.1.2-android vs. 32.1.2-jre</a></li> </ul> <h3>Changelog</h3> <ul> <li><a href="https://redirect.github.com/google/guava/issues/6642#issuecomment-1656201382">Removed</a> the section of our Gradle metadata that caused Gradle to report conflicts with <code>listenablefuture</code>. (9ed0fa65ab)</li> <li>Changed our Maven project to avoid <a href="https://redirect.github.com/google/guava/issues/6654">affecting which version of Mockito our Gradle users see</a>. (71a16d5a74)</li> <li><code>collect</code>: Under J2CL, exposed <code>ImmutableList</code> and <code>ImmutableSet</code> methods <code>copyOf</code> and <code>of</code> for JavaScript usage. (b41968f5f2)</li> <li><code>net</code>: Optimized <code>InternetDomainName</code> construction. (3a1d18fbefa10218988a0fbbb6e1fada012397bf, eaa62eb09548a6f1b7a757e21d8852724b631cab)</li> </ul> <h2>32.1.1</h2> <h3>Maven</h3> <pre lang="xml"><code><dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> <version>32.1.1-jre</version> <!-- or, for Android: --> <version>32.1.1-android</version> </tr></table> </code></pre> </blockquote> <p>... (truncated)</p> </details> <details> <summary>Commits</summary> <ul> <li>See full diff in <a href="https://github.com/google/guava/commits">compare view</a></li> </ul> </details> <br /> [![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=com.google.guava:guava&package-manager=gradle&previous-version=31.1-android&new-version=32.1.2-android)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) </details> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
101 lines
3.3 KiB
Groovy
101 lines
3.3 KiB
Groovy
plugins {
|
|
id 'com.android.application'
|
|
id 'com.github.ben-manes.versions'
|
|
id 'com.github.triplet.play' version '3.7.0'
|
|
}
|
|
|
|
dependencies {
|
|
implementation 'eu.chainfire:libsuperuser:1.1.0.202004101746'
|
|
implementation 'com.google.android.material:material:1.8.0'
|
|
implementation 'com.google.code.gson:gson:2.10.1'
|
|
implementation 'org.mindrot:jbcrypt:0.4'
|
|
implementation 'com.google.guava:guava:32.1.2-android'
|
|
implementation 'com.annimon:stream:1.2.2'
|
|
implementation 'com.android.volley:volley:1.2.1'
|
|
implementation 'commons-io:commons-io:2.11.0'
|
|
|
|
implementation ('com.journeyapps:zxing-android-embedded:4.3.0') { transitive = false }
|
|
implementation 'com.google.zxing:core:3.4.1'
|
|
|
|
implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
|
|
implementation 'com.google.dagger:dagger:2.46.1'
|
|
annotationProcessor 'com.google.dagger:dagger-compiler:2.46.1'
|
|
androidTestImplementation 'androidx.test:rules:1.4.0'
|
|
androidTestImplementation 'androidx.annotation:annotation:1.2.0'
|
|
}
|
|
|
|
android {
|
|
// Changes to these values need to be reflected in `../docker/Dockerfile`
|
|
compileSdkVersion 32
|
|
buildToolsVersion '32.0.0'
|
|
ndkVersion = "${ndkVersionShared}"
|
|
|
|
buildTypes.debug.applicationIdSuffix ".debug"
|
|
buildFeatures.dataBinding = true
|
|
|
|
defaultConfig {
|
|
applicationId "com.nutomic.syncthingandroid"
|
|
minSdkVersion 21
|
|
targetSdkVersion 32
|
|
versionCode 4361
|
|
versionName "1.23.7"
|
|
testApplicationId 'com.nutomic.syncthingandroid.test'
|
|
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
|
|
}
|
|
|
|
signingConfigs {
|
|
release {
|
|
storeFile = {
|
|
def path = System.getenv("SYNCTHING_RELEASE_STORE_FILE")
|
|
return (path) ? file(path) : null
|
|
}()
|
|
storePassword System.getenv("SIGNING_PASSWORD") ?: ""
|
|
keyAlias System.getenv("SYNCTHING_RELEASE_KEY_ALIAS") ?: ""
|
|
keyPassword System.getenv("SIGNING_PASSWORD") ?: ""
|
|
}
|
|
}
|
|
buildTypes {
|
|
release {
|
|
signingConfig = signingConfigs.release.storeFile ? signingConfigs.release : null
|
|
}
|
|
debug {
|
|
debuggable true
|
|
jniDebuggable true
|
|
renderscriptDebuggable true
|
|
minifyEnabled false
|
|
}
|
|
}
|
|
|
|
compileOptions {
|
|
sourceCompatibility JavaVersion.VERSION_11
|
|
targetCompatibility JavaVersion.VERSION_11
|
|
}
|
|
|
|
// Otherwise libsyncthing.so doesn't appear where it should in installs
|
|
// based on app bundles, and thus nothing works.
|
|
packagingOptions {
|
|
jniLibs {
|
|
useLegacyPackaging = true
|
|
}
|
|
}
|
|
}
|
|
|
|
play {
|
|
serviceAccountCredentials = file(System.getenv("SYNCTHING_RELEASE_PLAY_ACCOUNT_CONFIG_FILE") ?: 'keys.json')
|
|
track = 'beta'
|
|
}
|
|
|
|
/**
|
|
* Some languages are not supported by Google Play, so we ignore them.
|
|
*/
|
|
task deleteUnsupportedPlayTranslations(type: Delete) {
|
|
delete 'src/main/play/listings/de_DE/'
|
|
delete 'src/main/play/listings/el-EL/'
|
|
delete 'src/main/play/listings/en/'
|
|
delete 'src/main/play/listings/eo/'
|
|
delete 'src/main/play/listings/eu/'
|
|
delete 'src/main/play/listings/nb/'
|
|
delete 'src/main/play/listings/nl_BE/'
|
|
delete 'src/main/play/listings/nn/'
|
|
delete 'src/main/play/listings/ta/'
|
|
}
|