Skip to content

Commit

Permalink
Android Studio 3.2.1
Browse files Browse the repository at this point in the history
  • Loading branch information
hannesa2 authored and tballuch committed Dec 4, 2018
1 parent 4f02f97 commit 7a4c1d9
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 12 deletions.
2 changes: 0 additions & 2 deletions AndroidManifest.xml
Expand Up @@ -23,8 +23,6 @@
android:versionName="${versionName}">

<uses-sdk
android:minSdkVersion="14"
android:targetSdkVersion="26"
tools:overrideLibrary="android.support.customtabs"/>

<!--
Expand Down
5 changes: 4 additions & 1 deletion build.gradle
Expand Up @@ -11,7 +11,7 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.1.2'
classpath 'com.android.tools.build:gradle:3.2.1'
}
}

Expand Down Expand Up @@ -97,6 +97,9 @@ android {
compileSdkVersion 26

defaultConfig {
minSdkVersion 14
targetSdkVersion 26

manifestPlaceholders.versionCode = "20900300"
manifestPlaceholders.versionName = "2.9.3"

Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Expand Up @@ -3,5 +3,5 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
distributionSha256Sum=7a2c66d1a78f811d5f37d14630ad21cec5e77a2a4dc61e787e2257a6341016ce
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip
distributionSha256Sum=b7aedd369a26b177147bcb715f8b1fc4fe32b0a6ade0d7fd8ee5ed0c6f731f2c
7 changes: 2 additions & 5 deletions oc_jb_workaround/AndroidManifest.xml
Expand Up @@ -3,16 +3,13 @@
xmlns:tools="http://schemas.android.com/tools"
package="com.owncloud.android.workaround.accounts">

<uses-sdk
android:minSdkVersion="16"
android:targetSdkVersion="26"
tools:overrideLibrary="android.support.customtabs"/>
<uses-sdk tools:overrideLibrary="android.support.customtabs" />

<application
android:allowBackup="false"
android:icon="@mipmap/workaround_app_icon"
android:label="@string/workaround_app_name"
>
tools:ignore="GoogleAppIndexingWarning">
<service
android:name=".AccountAuthenticatorService"
android:exported="false">
Expand Down
5 changes: 4 additions & 1 deletion oc_jb_workaround/build.gradle
Expand Up @@ -6,7 +6,7 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.1.2'
classpath 'com.android.tools.build:gradle:3.2.1'
}
}

Expand All @@ -25,6 +25,9 @@ android {
compileSdkVersion 26

defaultConfig {
minSdkVersion 14
targetSdkVersion 26

versionCode = 100040
versionName = "1.0.40"
}
Expand Down

0 comments on commit 7a4c1d9

Please sign in to comment.