Skip to content

Upstream updates #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
isalgueiro merged 6 commits into from
Mar 30, 2018
Merged

Upstream updates #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0e44e4c
Bump gradle, android plugin and more.
menny Feb 26, 2018
9f84230
New docker image
menny Feb 27, 2018
877184e
Fixing ToC acceptance
menny Feb 27, 2018
0deb402
Bump Gradle to 4.6
menny Feb 28, 2018
505f013
Bumping android plugin
menny Feb 28, 2018
a725f89
Adding Google repo
menny Feb 28, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,14 @@ System.setProperty("file.encoding", "UTF-8")

buildscript {
repositories {
google()
jcenter()
mavenCentral()
maven { url 'https://jitpack.io' }
maven { url "https://plugins.gradle.org/m2/" }
}
dependencies {
classpath 'com.android.tools.build:gradle:2.3.3'
classpath 'com.android.tools.build:gradle:3.1.0-beta4'

classpath 'com.github.AnySoftKeyboard.AnySoftKeyboardTools:makedictionary:287fe7812294918636359e4d28dbcbc931f3dab8'
classpath 'com.github.AnySoftKeyboard.AnySoftKeyboardTools:generatewordslist:287fe7812294918636359e4d28dbcbc931f3dab8'
Expand Down Expand Up @@ -50,13 +51,13 @@ def generators = [
def versionData = versionGenerator.generateVersion(1, 0, 0, generators)

android {
compileSdkVersion 26
buildToolsVersion '26.0.0'
compileSdkVersion 27
buildToolsVersion '27.0.3'

defaultConfig {
applicationId "com.anysoftkeyboard.languagepack.languagepack"
minSdkVersion 7
targetSdkVersion 26
minSdkVersion 9
targetSdkVersion 27
versionName versionData.versionName
versionCode versionData.versionCode

Expand Down Expand Up @@ -135,10 +136,11 @@ afterEvaluate { proj ->

dependencies {
repositories {
google()
jcenter()
maven { url "https://jitpack.io" }
}
compile 'com.github.AnySoftKeyboard:AnySoftKeyboard-API:1.9.0'
api 'com.github.AnySoftKeyboard:AnySoftKeyboard-API:1.10.0'
}

task checkstyle(type: Checkstyle) {
Expand Down Expand Up @@ -188,4 +190,4 @@ task svgToDrawablePngPlay(type: SvgDrawableTask) {
doLast {
file('src/main/play/en-US/listing/icon/logo_launcher.png').renameTo(file('src/main/play/en-US/listing/icon/ask_logo.png'))
}
}
}
2 changes: 1 addition & 1 deletion circle.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ references:

container_config: &container_config
docker:
- image: menny/android:1.7.1
- image: menny/android:1.9.2

working_directory: *workspace_root

Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
View file
Open in desktop
Binary file not shown.
3 changes: 1 addition & 2 deletions gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#Sun Jul 09 16:48:45 EDT 2017
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.0-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-bin.zip
6 changes: 3 additions & 3 deletions gradlew
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion scripts/ci_setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,12 @@
mkdir -p ${ANDROID_HOME}/licenses || true
rm ${ANDROID_HOME}/licenses/* || true
#this value was taken from my local machine, after I accepted it locally.
echo -e "8933bad161af4178b1185d1a37fbf41ea5269c55\c" > ${ANDROID_HOME}/licenses/android-sdk-license
echo -e "8933bad161af4178b1185d1a37fbf41ea5269c55\nd56f5187479451eabf01fb78af6dfcb131a6481e\c" > ${ANDROID_HOME}/licenses/android-sdk-license
echo -e "79120722343a6f314e0719f863036c702b0e6b2a\n84831b9409646a918e30573bab4c9c91346d8abd\c" > ${ANDROID_HOME}/licenses/android-sdk-preview-license
echo -e "d975f751698a77b662f1254ddbeed3901e976f5a\c" > ${ANDROID_HOME}/licenses/intel-android-extra-license
echo -e "8403addf88ab4874007e1c1e80a0025bf2550a37\c" > ${ANDROID_HOME}/licenses/intel-android-sysimage-license


#setting up SDK paths
rm local.properties || true
echo -e "sdk.dir=${ANDROID_HOME}" > local.properties
Expand Down