Skip to content

[POC] Use okhttp for Android network layer #1604

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

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

[POC] Use okhttp for Android network layer #1604

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 18 additions & 1 deletion olp-cpp-sdk-core/cmake/android.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,28 @@ get_android_jar_path(CMAKE_JAVA_INCLUDE_PATH ANDROID_SDK_ROOT ANDROID_PLATFORM)
set(OLP_SDK_NETWORK_VERSION 0.0.1)
set(OLP_SDK_ANDROID_HTTP_CLIENT_JAR OlpHttpClient)

set(MAVEN_DEPS_OUTPUT ${CMAKE_BINARY_DIR}/maven-deps)
set(ALL_MAVEN_PACKAGES
${MAVEN_DEPS_OUTPUT}/okhttp-4.12.0.jar
${MAVEN_DEPS_OUTPUT}/okio-3.10.2.jar
)

add_custom_command(
OUTPUT ${ALL_MAVEN_PACKAGES}
COMMAND mvn -f ${CMAKE_CURRENT_LIST_DIR}/pom.xml dependency:copy-dependencies -DoutputDirectory=${MAVEN_DEPS_OUTPUT}
COMMENT "Downloading Maven packages"
)

add_custom_target(olp-cpp-sdk-core.maven DEPENDS ${ALL_MAVEN_PACKAGES})

add_jar(${OLP_SDK_ANDROID_HTTP_CLIENT_JAR}
SOURCES ${CMAKE_CURRENT_LIST_DIR}/../src/http/android/HttpClient.java
SOURCES ${CMAKE_CURRENT_LIST_DIR}/../src/http/android/OlpHttpClient.java
VERSION ${OLP_SDK_NETWORK_VERSION}
INCLUDE_JARS ${ALL_MAVEN_PACKAGES}
)

add_dependencies(${OLP_SDK_ANDROID_HTTP_CLIENT_JAR} olp-cpp-sdk-core.maven)

# add_jar() doesn't add the symlink to the version automatically under Windows
if (WIN32)
include(SymlinkHelpers)
Expand Down
19 changes: 19 additions & 0 deletions olp-cpp-sdk-core/cmake/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>com.here.olp</groupId>
<artifactId>download-jars</artifactId>
<version>1.0-SNAPSHOT</version>
<dependencies>
<dependency>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>okhttp</artifactId>
<version>4.12.0</version>
</dependency>
<dependency>
<groupId>com.squareup.okio</groupId>
<artifactId>okio</artifactId>
<version>3.10.2</version>
</dependency>
</dependencies>
</project>
Loading
Loading