flywithu/android-library
1
0
Fork 0
mirror of https://github.com/owncloud/android-library.git synced 2025-06-10 01:16:23 +00:00
Code Issues Releases Wiki Activity

Merge pull request #198 from hannesa2/AndroidStudio-3.2.1

Browse Source 
Android Studio 3.2.1
This commit is contained in:
David González Verdugo 2018-11-29 10:16:11 +01:00 committed by GitHub
commit 9502498245
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
AndroidManifest.xml
View File

@ -33,9 +33,5 @@
<uses-permission android:name="android.permission.USE_CREDENTIALS" /> <uses-permission android:name="android.permission.USE_CREDENTIALS" />
<uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" /> <uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" />
<uses-sdk
android:minSdkVersion="14"
android:targetSdkVersion="26" />
</manifest> </manifest>

7
build.gradle
View File

@ -4,7 +4,7 @@ buildscript {
jcenter() jcenter()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:3.1.2' classpath 'com.android.tools.build:gradle:3.2.1'
} }
} }
@ -27,6 +27,11 @@ dependencies {
android { android {
compileSdkVersion 26 compileSdkVersion 26
defaultConfig {
minSdkVersion 14
targetSdkVersion 26
}
sourceSets { sourceSets {
main { main {
manifest.srcFile 'AndroidManifest.xml' manifest.srcFile 'AndroidManifest.xml'

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-4.4-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip

3
sample_client/AndroidManifest.xml
View File

@ -29,9 +29,6 @@
android:versionName="1.0"> android:versionName="1.0">
<uses-permission android:name="android.permission.INTERNET"/> <uses-permission android:name="android.permission.INTERNET"/>
<uses-sdk
android:minSdkVersion="14"
android:targetSdkVersion="26"/>
<application <application
android:icon="@drawable/ic_launcher" android:icon="@drawable/ic_launcher"
android:label="@string/app_name"> android:label="@string/app_name">

5
sample_client/build.gradle
View File

@ -11,6 +11,11 @@ dependencies {
android { android {
compileSdkVersion 26 compileSdkVersion 26
defaultConfig {
minSdkVersion 14
targetSdkVersion 26
}
sourceSets { sourceSets {
main { main {
manifest.srcFile 'AndroidManifest.xml' manifest.srcFile 'AndroidManifest.xml'