mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-30 08:25:21 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #4360 from nextcloud/as350

Browse source 
Update due to Android Studio 3.5.0
This commit is contained in:
Andy Scherzinger 2019-08-22 19:05:22 +02:00 committed by GitHub
commit 1660024105
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 8 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
.idea/codeStyles/Project.xml
View file

@ -27,15 +27,7 @@
<emptyLine /> <emptyLine />
</value> </value>
</option> </option>
<AndroidXmlCodeStyleSettings>
<option name="USE_CUSTOM_SETTINGS" value="true" />
</AndroidXmlCodeStyleSettings>
<JavaCodeStyleSettings> <JavaCodeStyleSettings>
<option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
<option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
<option name="PACKAGES_TO_USE_IMPORT_ON_DEMAND">
<value />
</option>
<option name="IMPORT_LAYOUT_TABLE"> <option name="IMPORT_LAYOUT_TABLE">
<value> <value>
<package name="android" withSubpackages="true" static="false" /> <package name="android" withSubpackages="true" static="false" />
@ -72,9 +64,6 @@
<option name="RIGHT_MARGIN" value="120" /> <option name="RIGHT_MARGIN" value="120" />
</MarkdownNavigatorCodeStyleSettings> </MarkdownNavigatorCodeStyleSettings>
<XML> <XML>
<option name="XML_KEEP_LINE_BREAKS" value="false" />
<option name="XML_ALIGN_ATTRIBUTES" value="false" />
<option name="XML_SPACE_INSIDE_EMPTY_TAG" value="true" />
<option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" /> <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
</XML> </XML>
<codeStyleSettings language="JAVA"> <codeStyleSettings language="JAVA">
@ -87,7 +76,6 @@
<option name="FIELD_ANNOTATION_WRAP" value="0" /> <option name="FIELD_ANNOTATION_WRAP" value="0" />
</codeStyleSettings> </codeStyleSettings>
<codeStyleSettings language="XML"> <codeStyleSettings language="XML">
<option name="FORCE_REARRANGE_MODE" value="1" />
<indentOptions> <indentOptions>
<option name="CONTINUATION_INDENT_SIZE" value="4" /> <option name="CONTINUATION_INDENT_SIZE" value="4" />
</indentOptions> </indentOptions>

4
build.gradle
View file

@ -20,7 +20,7 @@ buildscript {
mavenCentral() mavenCentral()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:3.4.2' classpath 'com.android.tools.build:gradle:3.5.0'
classpath('com.dicedmelon.gradle:jacoco-android:0.1.4') { classpath('com.dicedmelon.gradle:jacoco-android:0.1.4') {
exclude group: 'org.codehaus.groovy', module: 'groovy-all' exclude group: 'org.codehaus.groovy', module: 'groovy-all'
} }
@ -220,7 +220,7 @@ android {
ignoreFailures = false ignoreFailures = false
effort = "max" effort = "max"
reportLevel = "medium" reportLevel = "medium"
classes = fileTree("$project.buildDir/intermediates/javac/${variantName}/compile${capVariantName}JavaWithJavac/classes/") classes = fileTree("$project.buildDir/intermediates/javac/${variantName}/classes/")
excludeFilter = file("${project.rootDir}/spotbugs-filter.xml") excludeFilter = file("${project.rootDir}/spotbugs-filter.xml")
pluginClasspath = project.configurations.spotbugsPlugins pluginClasspath = project.configurations.spotbugsPlugins
source = fileTree('src/main/java') source = fileTree('src/main/java')

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

@ -1,7 +1,6 @@
#Thu Apr 18 07:07:10 CEST 2019 #Wed Aug 21 07:03:37 CEST 2019
distributionBase=GRADLE_USER_HOME 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-5.1.1-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
distributionSha256Sum=53b71812f18cdb2777e9f1b2a0f2038683907c90bdc406bc64d8b400e1fb2c3b

1
scripts/analysis/findbugs-up.rb
View file

@ -47,6 +47,7 @@ require 'xmlsimple'
# run FindBugs # run FindBugs
puts "running FindBugs..." puts "running FindBugs..."
system './gradlew assembleGplayDebug'
system './gradlew spotbugsGplayDebug' system './gradlew spotbugsGplayDebug'
# find FindBugs report file # find FindBugs report file

2
scripts/analysis/lint-results.txt
View file

@ -1,2 +1,2 @@
DO NOT TOUCH; GENERATED BY DRONE DO NOT TOUCH; GENERATED BY DRONE
<span class="mdl-layout-title">Lint Report: 58 warnings</span> <span class="mdl-layout-title">Lint Report: 59 warnings</span>

3
src/main/java/com/nextcloud/client/device/DeviceInfo.kt
View file

@ -24,9 +24,10 @@ package com.nextcloud.client.device
import android.content.Context import android.content.Context
import android.content.pm.PackageManager import android.content.pm.PackageManager
import android.os.Build import android.os.Build
import java.util.Locale
class DeviceInfo { class DeviceInfo {
val vendor: String = Build.MANUFACTURER.toLowerCase() val vendor: String = Build.MANUFACTURER.toLowerCase(Locale.ROOT)
val apiLevel: Int = Build.VERSION.SDK_INT val apiLevel: Int = Build.VERSION.SDK_INT
fun hasCamera(context: Context): Boolean { fun hasCamera(context: Context): Boolean {