Merge branch 'release/5.39.0'

Author: subsymbolic

app/CMakeLists.txt

@@ -10,22 +10,6 @@ cmake_minimum_required(VERSION 3.4.1)
 # You can define multiple libraries, and CMake builds them for you.
 # Gradle automatically packages shared libraries with your APK.
 
-add_library( # Sets the name of the library.
-        adblockclient-lib
-
-        # Sets the library as a shared library.
-        SHARED
-
-        # Provides a relative path to your source file(s).
-        src/main/cpp/adblockclient-lib.cpp
-        src/main/cpp/third-party/ad-block/ad_block_client.cc
-        src/main/cpp/third-party/ad-block/cosmetic_filter.cc
-        src/main/cpp/third-party/ad-block/filter.cc
-        src/main/cpp/third-party/bloom-filter-cpp/BloomFilter.cpp
-        src/main/cpp/third-party/bloom-filter-cpp/hashFn.cpp
-        src/main/cpp/third-party/hashset-cpp/HashSet.cpp
-        )
-
 add_library( # Sets the name of the library.
         https-bloom-lib
 
@@ -48,15 +32,4 @@ find_library( # Sets the name of the path variable.
 
         # Specifies the name of the NDK library that
         # you want CMake to locate.
-        log)
-
-# Specifies libraries CMake should link to your target library. You
-# can link multiple libraries, such as libraries you define in this
-# build script, prebuilt third-party libraries, or system libraries.
-
-target_link_libraries( # Specifies the target library.
-        adblockclient-lib
-
-        # Links the target library to the log library
-        # included in the NDK.
-        ${log-lib})
+        log)

app/build.gradle

@@ -31,6 +31,10 @@ android {
             androidTest.resources.srcDirs += files("$projectDir/../submodules/".toString())
         }
     }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
+    }
     kotlinOptions {
         jvmTarget = "1.8"
     }
@@ -139,6 +143,7 @@ dependencies {
     implementation "com.squareup.retrofit2:retrofit:$retrofit"
     implementation "com.squareup.retrofit2:converter-moshi:$retrofit"
     implementation "com.squareup.retrofit2:adapter-rxjava2:$retrofit"
+    implementation "com.squareup.retrofit2:converter-scalars:$retrofit"
     implementation 'com.jakewharton.retrofit:retrofit2-kotlin-coroutines-adapter:0.9.2'
     implementation "io.reactivex.rxjava2:rxjava:$rxJava"
     implementation "io.reactivex.rxjava2:rxandroid:$rxAndroid"