Android gradle 2.3.3

.travis.yml

@@ -26,8 +26,11 @@ before_install:
 before_script:
 - . ./setenv.sh
 script:
-- travis_wait 30 ./travis.sh
+- travis_wait 60 ./travis.sh
+after_script:
+- sleep 1
 after_failure:
+- sleep 1
 - cat emulator.log
 - cat logcat.log
 after_success:

Dockerfile

@@ -8,5 +8,6 @@ WORKDIR /installs/libsodium-jni
 ADD . /installs/libsodium-jni
 ADD settings.xml ~/.m2/settings.xml
 
-RUN ./dependencies.sh 
+RUN ./dependencies-apt-linux.sh
+RUN ./dependencies-linux.sh
 RUN ./build-linux.sh

build-linux.sh

@@ -1,4 +1,4 @@
-#!/bin/bash -ev
+#!/bin/bash -v
 
 . ./setenv.sh
 

build.gradle

@@ -10,6 +10,7 @@ repositories {
 
 android {
     compileSdkVersion 25
+    //https://developer.android.com/studio/releases/build-tools.html
     buildToolsVersion "25.0.2"
 
     defaultConfig {
@@ -65,7 +66,7 @@ buildscript {
         mavenLocal()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.0'
+        classpath 'com.android.tools.build:gradle:2.3.3'
         classpath "io.codearte.gradle.nexus:gradle-nexus-staging-plugin:0.11.0"
     }
 }

dependencies-apt-linux.sh

@@ -0,0 +1,35 @@
+#!/bin/bash -ev
+
+. ./setenv.sh
+
+sudo apt-get -qq update
+sudo apt-get -y -qq install lsb-release
+
+lsb_release -a
+
+sudo apt-get -qq update && sudo apt-get -y -qq install python-software-properties software-properties-common
+sudo add-apt-repository -y "deb http://archive.ubuntu.com/ubuntu $(lsb_release -sc) universe"
+sudo apt-get -qq update
+
+sudo add-apt-repository -y ppa:saiarcot895/myppa
+sudo apt-get -qq update
+sudo apt-get -y -qq install apt-fast
+
+sudo apt-fast -qq update
+
+sudo apt-fast -y -qq install wget git autoconf autoconf automake build-essential autogen libtool gettext-base gettext vim bzip2 libpcre3-dev libpcre++-dev pkg-config unzip
+#gradle building issues
+sudo apt-fast -y -qq install gcc-multilib lib32z1
+sudo add-apt-repository ppa:webupd8team/java -y 
+sudo apt-fast -qq update 
+echo oracle-java8-installer shared/accepted-oracle-license-v1-1 select true | sudo /usr/bin/debconf-set-selections
+sudo apt-fast -y -qq install oracle-java8-installer maven 
+
+#http://apt.llvm.org/
+wget -O - http://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
+sudo apt-add-repository "deb http://apt.llvm.org/$(lsb_release -sc)/ llvm-toolchain-$(lsb_release -sc)-${CLANG_VERSION} main"
+#sudo apt-add-repository "deb-src http://apt.llvm.org/$(lsb_release -sc)/ llvm-toolchain-$(lsb_release -sc)-${CLANG_VERSION} main"
+sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
+sudo apt-fast -qq update
+sudo apt-fast -y install clang-${CLANG_VERSION} lldb-${CLANG_VERSION}
+

dependencies-linux.sh

@@ -4,37 +4,6 @@ set -ev
 
 . ./setenv.sh
 
-sudo apt-get -qq update
-sudo apt-get -y -qq install lsb-release
-
-lsb_release -a
-
-sudo apt-get -qq update && sudo apt-get -y -qq install python-software-properties software-properties-common
-sudo add-apt-repository -y "deb http://archive.ubuntu.com/ubuntu $(lsb_release -sc) universe"
-sudo apt-get -qq update
-
-sudo add-apt-repository -y ppa:saiarcot895/myppa
-sudo apt-get -qq update
-sudo apt-get -y -qq install apt-fast
-
-sudo apt-fast -qq update
-
-sudo apt-fast -y -qq install wget git autoconf autoconf automake build-essential autogen libtool gettext-base gettext vim bzip2 libpcre3-dev libpcre++-dev pkg-config unzip
-#gradle building issues
-sudo apt-fast -y -qq install gcc-multilib lib32z1
-sudo add-apt-repository ppa:webupd8team/java -y 
-sudo apt-fast -qq update 
-echo oracle-java8-installer shared/accepted-oracle-license-v1-1 select true | sudo /usr/bin/debconf-set-selections
-sudo apt-fast -y -qq install oracle-java8-installer maven 
-
-#http://apt.llvm.org/
-wget -O - http://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
-sudo apt-add-repository "deb http://apt.llvm.org/$(lsb_release -sc)/ llvm-toolchain-$(lsb_release -sc)-${CLANG_VERSION} main"
-#sudo apt-add-repository "deb-src http://apt.llvm.org/$(lsb_release -sc)/ llvm-toolchain-$(lsb_release -sc)-${CLANG_VERSION} main"
-sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
-sudo apt-fast -qq update
-sudo apt-fast -y install clang-${CLANG_VERSION} lldb-${CLANG_VERSION}
-
 mkdir -p ./installs
 pushd ./installs
 wget --quiet http://dl.google.com/android/repository/android-ndk-${NDK_VERSION}-linux-x86_64.zip

dependencies.sh

@@ -1,9 +1,10 @@
-#!/bin/bash -ev
+#!/bin/bash -v
 
 if [[ $TRAVIS_OS_NAME == 'osx' ]]; then
     ./dependencies-mac.sh
 else
     . ./setenv.sh
+    ./dependencies-apt-linux.sh
     ./dependencies-linux.sh    
     #./android-emulator.sh
 fi

download-gradle.sh

@@ -6,9 +6,10 @@ pushd ./installs
 wget --quiet https://services.gradle.org/distributions/gradle-${GRADLE_VERSION}-bin.zip
 test -e "gradle-${GRADLE_VERSION}" || unzip -qq "gradle-${GRADLE_VERSION}"-bin.zip
 
-wget --quiet https://dl.google.com/android/repository/tools_${ANDROID_SDK_VERSION}-linux.zip
+#wget --quiet https://dl.google.com/android/repository/tools_${ANDROID_SDK_VERSION}-linux.zip
+wget --quiet https://dl.google.com/android/repository/sdk-tools-linux-${ANDROID_SDK_TOOLS_VERSION}.zip
 #must unzip to android-sdk directory and place tools inside
-test -e "android-sdk" || unzip -qq tools_${ANDROID_SDK_VERSION}-linux.zip -d android-sdk # Do not overwrite an installed Android SDK, because overwriting it may corrupt it.
+test -e "android-sdk" || unzip -qq sdk-tools-linux-${ANDROID_SDK_TOOLS_VERSION}.zip -d android-sdk # Do not overwrite an installed Android SDK, because overwriting it may corrupt it.
 popd
 
 mkdir -p ${ANDROID_HOME}/licenses

example/Sodium/build.gradle

@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.0'
+        classpath 'com.android.tools.build:gradle:2.3.3'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

setenv.sh

@@ -1,8 +1,12 @@
 #!/bin/bash
 
 export GRADLE_OPTS="-Dorg.gradle.native=false -Dorg.gradle.daemon=true"
-export NDK_VERSION=r14b
-export ANDROID_SDK_VERSION=r25.2.5
+#https://developer.android.com/ndk/downloads/index.html
+export NDK_VERSION=r15c
+#https://developer.android.com/studio/releases/sdk-tools.html
+export ANDROID_SDK_VERSION=r26.0.2
+#https://developer.android.com/studio/index.html?hl=sk#downloads
+export ANDROID_SDK_TOOLS_VERSION=3859397
 export CLANG_VERSION=3.9
 
 if uname -a | grep -q -i darwin; then
@@ -12,9 +16,11 @@ if uname -a | grep -q -i darwin; then
     export ANDROID_SDK=/usr/local/share/android-sdk
     export ANDROID_HOME=/usr/local/share/android-sdk
 else
-    export MAVEN_VERSION=3.3.9
-    export GRADLE_VERSION=3.4.1
-    export NDK_TOOLCHAIN_PLATFORM=14
+    #https://maven.apache.org/download.cgi
+    export MAVEN_VERSION=3.5.0
+    #https://gradle.org/releases
+    export GRADLE_VERSION=4.1
+    export NDK_TOOLCHAIN_PLATFORM=15
     export NDK_TOOLCHAIN_ARCHITECTURE=arm
     export NDK_ROOT=`pwd`/installs/android-ndk-${NDK_VERSION}
     export PATH=${NDK_ROOT}:$PATH

update-android.sh

@@ -1,7 +1,10 @@
-#!/bin/bash -ev
+#!/bin/bash -v
 
 . ./setenv.sh
 
+sdkmanager --update
+sdkmanager --list
+
 echo y | sdkmanager "platform-tools"
 echo y | sdkmanager "tools"
 
@@ -12,11 +15,13 @@ echo y | sdkmanager "extras;google;m2repository"
 echo y | sdkmanager "build-tools;23.0.2"
 echo y | sdkmanager "build-tools;23.0.3" 
 echo y | sdkmanager "build-tools;25.0.2" 
+echo y | sdkmanager "build-tools;26.0.0"
 
 echo y | sdkmanager "platforms;android-16" 
 echo y | sdkmanager "platforms;android-21" 
 echo y | sdkmanager "platforms;android-23" 
 echo y | sdkmanager "platforms;android-24" 
 echo y | sdkmanager "platforms;android-25" 
+echo y | sdkmanager "platforms;android-26"
 
 sdkmanager --update