Skip to content
This repository was archived by the owner on Feb 4, 2020. It is now read-only.

Commit 30cec09

Browse files
authored
Merge pull request #2 from isalgueiro/master
Updates from upstream
2 parents 3ea298e + bd20b97 commit 30cec09

6 files changed

Lines changed: 17 additions & 14 deletions

File tree

build.gradle

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,15 @@ System.setProperty("file.encoding", "UTF-8")
1111

1212
buildscript {
1313
repositories {
14+
google()
1415
jcenter()
1516
mavenCentral()
1617
google()
1718
maven { url 'https://jitpack.io' }
1819
maven { url "https://plugins.gradle.org/m2/" }
1920
}
2021
dependencies {
21-
classpath 'com.android.tools.build:gradle:3.1.0'
22+
classpath 'com.android.tools.build:gradle:3.1.0-beta4'
2223

2324
classpath 'com.github.AnySoftKeyboard.AnySoftKeyboardTools:makedictionary:287fe7812294918636359e4d28dbcbc931f3dab8'
2425
classpath 'com.github.AnySoftKeyboard.AnySoftKeyboardTools:generatewordslist:287fe7812294918636359e4d28dbcbc931f3dab8'
@@ -51,13 +52,13 @@ def generators = [
5152
def versionData = versionGenerator.generateVersion(1, 0, 0, generators)
5253

5354
android {
54-
compileSdkVersion 26
55-
buildToolsVersion '26.0.0'
55+
compileSdkVersion 27
56+
buildToolsVersion '27.0.3'
5657

5758
defaultConfig {
5859
applicationId "com.anysoftkeyboard.languagepack.galician"
59-
minSdkVersion 7
60-
targetSdkVersion 26
60+
minSdkVersion 9
61+
targetSdkVersion 27
6162
versionName versionData.versionName
6263
versionCode versionData.versionCode
6364

@@ -139,10 +140,11 @@ afterEvaluate { proj ->
139140

140141
dependencies {
141142
repositories {
143+
google()
142144
jcenter()
143145
maven { url "https://jitpack.io" }
144146
}
145-
compile 'com.github.AnySoftKeyboard:AnySoftKeyboard-API:1.9.0'
147+
api 'com.github.AnySoftKeyboard:AnySoftKeyboard-API:1.10.0'
146148
}
147149

148150
task checkstyle(type: Checkstyle) {
@@ -192,4 +194,4 @@ task svgToDrawablePngPlay(type: SvgDrawableTask) {
192194
doLast {
193195
file('src/main/play/en-US/listing/icon/logo_launcher.png').renameTo(file('src/main/play/en-US/listing/icon/ask_logo.png'))
194196
}
195-
}
197+
}

circle.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ references:
77

88
container_config: &container_config
99
docker:
10-
- image: menny/android:1.7.1
10+
- image: menny/android:1.9.2
1111

1212
working_directory: *workspace_root
1313

gradle/wrapper/gradle-wrapper.jar

125 Bytes
Binary file not shown.
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
#Fri Mar 30 01:08:41 CEST 2018
21
distributionBase=GRADLE_USER_HOME
32
distributionPath=wrapper/dists
43
zipStoreBase=GRADLE_USER_HOME
54
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
5+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-bin.zip

gradlew

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

scripts/ci_setup.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,12 @@
44
mkdir -p ${ANDROID_HOME}/licenses || true
55
rm ${ANDROID_HOME}/licenses/* || true
66
#this value was taken from my local machine, after I accepted it locally.
7-
echo -e "8933bad161af4178b1185d1a37fbf41ea5269c55\c" > ${ANDROID_HOME}/licenses/android-sdk-license
7+
echo -e "8933bad161af4178b1185d1a37fbf41ea5269c55\nd56f5187479451eabf01fb78af6dfcb131a6481e\c" > ${ANDROID_HOME}/licenses/android-sdk-license
88
echo -e "79120722343a6f314e0719f863036c702b0e6b2a\n84831b9409646a918e30573bab4c9c91346d8abd\c" > ${ANDROID_HOME}/licenses/android-sdk-preview-license
9+
echo -e "d975f751698a77b662f1254ddbeed3901e976f5a\c" > ${ANDROID_HOME}/licenses/intel-android-extra-license
910
echo -e "8403addf88ab4874007e1c1e80a0025bf2550a37\c" > ${ANDROID_HOME}/licenses/intel-android-sysimage-license
1011

12+
1113
#setting up SDK paths
1214
rm local.properties || true
1315
echo -e "sdk.dir=${ANDROID_HOME}" > local.properties

0 commit comments

Comments
 (0)