From c63f0b61b19543a80fa60373da0244759a25815a Mon Sep 17 00:00:00 2001
From: Ricardo Rocha <Ricardo.Rocha@partner.bmwgroup.com>
Date: Wed, 17 Jul 2019 09:34:40 +0100
Subject: [PATCH] [Docker] Updates joyrn docker container to Android API 28

---
 docker/joynr-android/Dockerfile        | 7 ++++---
 docker/joynr-base/docker-image-version | 2 +-
 joynr-setup-android-sdk.sh             | 6 +++---
 pom.xml                                | 4 ++--
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/docker/joynr-android/Dockerfile b/docker/joynr-android/Dockerfile
index 1b45c33447..ccc5c87698 100644
--- a/docker/joynr-android/Dockerfile
+++ b/docker/joynr-android/Dockerfile
@@ -17,8 +17,8 @@ RUN chmod 777 -R /data/scripts/build/
 
 ENV ANDROID_SDK_FILENAME sdk-tools-linux-4333796.zip
 ENV ANDROID_SDK_URL https://dl.google.com/android/repository/${ANDROID_SDK_FILENAME}
-ENV ANDROID_API_LEVEL android-26
-ENV ANDROID_BUILD_TOOLS_VERSION 26.0.3
+ENV ANDROID_API_LEVEL android-28
+ENV ANDROID_BUILD_TOOLS_VERSION 29.0.0
 ENV ANDROID_HOME /opt/android-sdk-linux
 ENV PATH ${PATH}:${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools
 RUN cd /opt \
@@ -31,7 +31,8 @@ RUN cd /opt \
 RUN chown -R root:root ${ANDROID_HOME} \
     && chmod -R 755 ${ANDROID_HOME}
 # set this date to cause android to be updated
-ENV REFRESHED_ANDROID_AT 2018-10-23
+ENV REFRESHED_ANDROID_AT 2019-07-15
 RUN /data/scripts/build/setup-android.sh
 
 RUN date -R > /data/timestamp
+
diff --git a/docker/joynr-base/docker-image-version b/docker/joynr-base/docker-image-version
index 3fdcd7c44c..38b10c1b2b 100644
--- a/docker/joynr-base/docker-image-version
+++ b/docker/joynr-base/docker-image-version
@@ -1 +1 @@
-67
+68
diff --git a/joynr-setup-android-sdk.sh b/joynr-setup-android-sdk.sh
index c2458de6f4..bd929be92f 100755
--- a/joynr-setup-android-sdk.sh
+++ b/joynr-setup-android-sdk.sh
@@ -22,7 +22,7 @@ then
 fi
 
 mvn -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn \
--q dependency:get -Dartifact=android:android:8.0.0_r2
+-q dependency:get -Dartifact=android:android:9_r6
 
 if [ $? -eq 0 ]
 then
@@ -38,10 +38,10 @@ fi
 	git clone --depth 1 https://github.com/simpligility/maven-android-sdk-deployer
 )
 (
-	log "INSTALL OREO SDK TO MAVEN REPOSITORY"
+	log "INSTALL PIE SDK TO MAVEN REPOSITORY"
 	cd maven-android-sdk-deployer
 	mvn -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn \
-	install -P 8.0
+	install -P 9.0
 
 )
 (
diff --git a/pom.xml b/pom.xml
index fe2214196a..b28e4e1db4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -428,8 +428,8 @@
 		<jetty.version>9.2.13.v20150730</jetty.version>
 		<tycho.version>0.24.0</tycho.version>
 		<hibernate.version>4.3.8.Final</hibernate.version>
-		<android.platform.version>8.0.0_r2</android.platform.version>
-		<android.platform.level>26</android.platform.level>
+		<android.platform.version>9_r6</android.platform.version>
+		<android.platform.level>28</android.platform.level>
 		<skipTests>true</skipTests>
 		<franca.version>0.13.1</franca.version>
 		<xtend.version>2.16.0</xtend.version>