diff --git a/.circleci/config.yml b/.circleci/config.yml index 37c193be..c6001cae 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -3,11 +3,13 @@ jobs: build: working_directory: ~/code docker: - - image: bitriseio/android-ndk + - image: circleci/android:api-28-ndk environment: JVM_OPTS: -Xmx3200m steps: - checkout + - run: yes | sdkmanager --licenses || exit 0 + - run: yes | sdkmanager --update || exit 0 - restore_cache: key: jars-{{ checksum "build.gradle" }}-{{ checksum "app/build.gradle" }} - run: diff --git a/.idea/.gitignore b/.idea/.gitignore deleted file mode 100644 index 05cc59ca..00000000 --- a/.idea/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -workspace.xml -markdown-* -misc.xml diff --git a/.idea/.name b/.idea/.name deleted file mode 100644 index 373175e3..00000000 --- a/.idea/.name +++ /dev/null @@ -1 +0,0 @@ -xmrwallet \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml deleted file mode 100644 index 96cc43ef..00000000 --- a/.idea/compiler.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml deleted file mode 100644 index e7bedf33..00000000 --- a/.idea/copyright/profiles_settings.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml deleted file mode 100644 index cde9d869..00000000 --- a/.idea/gradle.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index dce0d43c..00000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml deleted file mode 100644 index 7f68460d..00000000 --- a/.idea/runConfigurations.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 94a25f7f..00000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/build.gradle b/build.gradle index 6f144406..9cb91bc3 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:3.2.1' + classpath 'com.android.tools.build:gradle:3.3.0' } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 67f3de40..29c3a4bf 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Tue Sep 25 22:18:09 CEST 2018 +#Mon Jan 21 16:37:55 CET 2019 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip diff --git a/xmrwallet.iml b/xmrwallet.iml index bb050e81..4d7ac8df 100644 --- a/xmrwallet.iml +++ b/xmrwallet.iml @@ -13,7 +13,7 @@ - + \ No newline at end of file