diff --git a/.ci/images_matrix.json b/.ci/images_matrix.json index cd0241e..b170e9f 100644 --- a/.ci/images_matrix.json +++ b/.ci/images_matrix.json @@ -1,13 +1,5 @@ { "android_api": [ - { - "api": 28, - "build_tools": "28.0.3" - }, - { - "api": 29, - "build_tools": "29.0.3" - }, { "api": 30, "build_tools": "30.0.3" diff --git a/tests/run_tests.sh b/tests/run_tests.sh index 802290d..655cde7 100755 --- a/tests/run_tests.sh +++ b/tests/run_tests.sh @@ -64,7 +64,6 @@ export BUILD_TOOLS_VERSION="$android_build_tools" export MIN_SDK_VERSION=21 export TARGET_SDK_VERSION="$android_api" export NDK_VERSION="21.0.6113669" -jenv global 17 setup_gradle_version() { if grep -q "distributionUrl" ./gradle/wrapper/gradle-wrapper.properties; then @@ -88,6 +87,7 @@ exec_test() { ruby -v eval "$(jenv init -)" +jenv global 17 if [ "$android_ndk" = true ]; then echo "Running tests with ndk" exec_test "$script_path"/test-app-ndk @@ -97,22 +97,13 @@ else fi if [ "$large_test" = true ]; then - echo "Run android tests on Firebase Test Lab" - cd "$script_path"/test-firebase-test-lab - - setup_gradle_version - - bundle install - bundle exec fastlane android integrated_test -fi - -if (( "$android_api" < 31 )); then - export GRADLE_VERSION="5.6.4" - export ANDROID_GRADLE_TOOLS_VERSION="3.6.1" jenv global 1.8 - exec_test "$script_path"/test-app-jdk-8 + echo "Run android tests on Firebase Test Lab" + cd "$script_path"/test-firebase-test-lab - jenv global 17 -fi + setup_gradle_version + bundle install + bundle exec fastlane android integrated_test +fi exit 0 diff --git a/tests/test-app-jdk-8/.gitignore b/tests/test-app-jdk-8/.gitignore deleted file mode 100644 index e553a6f..0000000 --- a/tests/test-app-jdk-8/.gitignore +++ /dev/null @@ -1,9 +0,0 @@ -*.iml -.gradle -/local.properties -/.idea/** -.DS_Store -/build -/captures -.externalNativeBuild -.cxx diff --git a/tests/test-app-jdk-8/.ruby-version b/tests/test-app-jdk-8/.ruby-version deleted file mode 100644 index 860487c..0000000 --- a/tests/test-app-jdk-8/.ruby-version +++ /dev/null @@ -1 +0,0 @@ -2.7.1 diff --git a/tests/test-app-jdk-8/Gemfile b/tests/test-app-jdk-8/Gemfile deleted file mode 100644 index accd96c..0000000 --- a/tests/test-app-jdk-8/Gemfile +++ /dev/null @@ -1,6 +0,0 @@ -source "https://rubygems.org" -ruby "2.7.1" -gem "fastlane" - -plugins_path = File.join(File.dirname(__FILE__), 'fastlane', 'Pluginfile') -eval_gemfile(plugins_path) if File.exist?(plugins_path) diff --git a/tests/test-app-jdk-8/Gemfile.lock b/tests/test-app-jdk-8/Gemfile.lock deleted file mode 100644 index 6954f06..0000000 --- a/tests/test-app-jdk-8/Gemfile.lock +++ /dev/null @@ -1,228 +0,0 @@ -GEM - remote: https://rubygems.org/ - specs: - CFPropertyList (3.0.5) - rexml - addressable (2.8.0) - public_suffix (>= 2.0.2, < 5.0) - artifactory (3.0.15) - atomos (0.1.3) - aws-eventstream (1.2.0) - aws-partitions (1.556.0) - aws-sdk-core (3.126.2) - aws-eventstream (~> 1, >= 1.0.2) - aws-partitions (~> 1, >= 1.525.0) - aws-sigv4 (~> 1.1) - jmespath (~> 1.0) - aws-sdk-kms (1.54.0) - aws-sdk-core (~> 3, >= 3.126.0) - aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.112.0) - aws-sdk-core (~> 3, >= 3.126.0) - aws-sdk-kms (~> 1) - aws-sigv4 (~> 1.4) - aws-sigv4 (1.4.0) - aws-eventstream (~> 1, >= 1.0.2) - babosa (1.0.4) - badge (0.13.0) - fastimage (>= 1.6) - fastlane (>= 2.0) - mini_magick (>= 4.9.4, < 5.0.0) - claide (1.1.0) - colored (1.2) - colored2 (3.1.2) - commander (4.6.0) - highline (~> 2.0.0) - declarative (0.0.20) - digest-crc (0.6.4) - rake (>= 12.0.0, < 14.0.0) - domain_name (0.5.20190701) - unf (>= 0.0.5, < 1.0.0) - dotenv (2.7.6) - emoji_regex (3.2.3) - excon (0.91.0) - faraday (1.10.0) - faraday-em_http (~> 1.0) - faraday-em_synchrony (~> 1.0) - faraday-excon (~> 1.1) - faraday-httpclient (~> 1.0) - faraday-multipart (~> 1.0) - faraday-net_http (~> 1.0) - faraday-net_http_persistent (~> 1.0) - faraday-patron (~> 1.0) - faraday-rack (~> 1.0) - faraday-retry (~> 1.0) - ruby2_keywords (>= 0.0.4) - faraday-cookie_jar (0.0.7) - faraday (>= 0.8.0) - http-cookie (~> 1.0.0) - faraday-em_http (1.0.0) - faraday-em_synchrony (1.0.0) - faraday-excon (1.1.0) - faraday-httpclient (1.0.1) - faraday-multipart (1.0.3) - multipart-post (>= 1.2, < 3) - faraday-net_http (1.0.1) - faraday-net_http_persistent (1.2.0) - faraday-patron (1.0.0) - faraday-rack (1.0.0) - faraday-retry (1.0.3) - faraday_middleware (1.2.0) - faraday (~> 1.0) - fastimage (2.2.6) - fastlane (2.204.3) - CFPropertyList (>= 2.3, < 4.0.0) - addressable (>= 2.8, < 3.0.0) - artifactory (~> 3.0) - aws-sdk-s3 (~> 1.0) - babosa (>= 1.0.3, < 2.0.0) - bundler (>= 1.12.0, < 3.0.0) - colored - commander (~> 4.6) - dotenv (>= 2.1.1, < 3.0.0) - emoji_regex (>= 0.1, < 4.0) - excon (>= 0.71.0, < 1.0.0) - faraday (~> 1.0) - faraday-cookie_jar (~> 0.0.6) - faraday_middleware (~> 1.0) - fastimage (>= 2.1.0, < 3.0.0) - gh_inspector (>= 1.1.2, < 2.0.0) - google-apis-androidpublisher_v3 (~> 0.3) - google-apis-playcustomapp_v1 (~> 0.1) - google-cloud-storage (~> 1.31) - highline (~> 2.0) - json (< 3.0.0) - jwt (>= 2.1.0, < 3) - mini_magick (>= 4.9.4, < 5.0.0) - multipart-post (~> 2.0.0) - naturally (~> 2.2) - optparse (~> 0.1.1) - plist (>= 3.1.0, < 4.0.0) - rubyzip (>= 2.0.0, < 3.0.0) - security (= 0.1.3) - simctl (~> 1.6.3) - terminal-notifier (>= 2.0.0, < 3.0.0) - terminal-table (>= 1.4.5, < 2.0.0) - tty-screen (>= 0.6.3, < 1.0.0) - tty-spinner (>= 0.8.0, < 1.0.0) - word_wrap (~> 1.0.0) - xcodeproj (>= 1.13.0, < 2.0.0) - xcpretty (~> 0.3.0) - xcpretty-travis-formatter (>= 0.0.3) - fastlane-plugin-badge (1.5.0) - badge (~> 0.13.0) - gh_inspector (1.1.3) - google-apis-androidpublisher_v3 (0.16.0) - google-apis-core (>= 0.4, < 2.a) - google-apis-core (0.4.2) - addressable (~> 2.5, >= 2.5.1) - googleauth (>= 0.16.2, < 2.a) - httpclient (>= 2.8.1, < 3.a) - mini_mime (~> 1.0) - representable (~> 3.0) - retriable (>= 2.0, < 4.a) - rexml - webrick - google-apis-iamcredentials_v1 (0.10.0) - google-apis-core (>= 0.4, < 2.a) - google-apis-playcustomapp_v1 (0.7.0) - google-apis-core (>= 0.4, < 2.a) - google-apis-storage_v1 (0.11.0) - google-apis-core (>= 0.4, < 2.a) - google-cloud-core (1.6.0) - google-cloud-env (~> 1.0) - google-cloud-errors (~> 1.0) - google-cloud-env (1.5.0) - faraday (>= 0.17.3, < 2.0) - google-cloud-errors (1.2.0) - google-cloud-storage (1.36.1) - addressable (~> 2.8) - digest-crc (~> 0.4) - google-apis-iamcredentials_v1 (~> 0.1) - google-apis-storage_v1 (~> 0.1) - google-cloud-core (~> 1.6) - googleauth (>= 0.16.2, < 2.a) - mini_mime (~> 1.0) - googleauth (1.1.1) - faraday (>= 0.17.3, < 2.0) - jwt (>= 1.4, < 3.0) - memoist (~> 0.16) - multi_json (~> 1.11) - os (>= 0.9, < 2.0) - signet (>= 0.16, < 2.a) - highline (2.0.3) - http-cookie (1.0.4) - domain_name (~> 0.5) - httpclient (2.8.3) - jmespath (1.6.0) - json (2.6.1) - jwt (2.3.0) - memoist (0.16.2) - mini_magick (4.11.0) - mini_mime (1.1.2) - multi_json (1.15.0) - multipart-post (2.0.0) - nanaimo (0.3.0) - naturally (2.2.1) - optparse (0.1.1) - os (1.1.4) - plist (3.6.0) - public_suffix (4.0.6) - rake (13.0.6) - representable (3.1.1) - declarative (< 0.1.0) - trailblazer-option (>= 0.1.1, < 0.2.0) - uber (< 0.2.0) - retriable (3.1.2) - rexml (3.2.5) - rouge (2.0.7) - ruby2_keywords (0.0.5) - rubyzip (2.3.2) - security (0.1.3) - signet (0.16.0) - addressable (~> 2.8) - faraday (>= 0.17.3, < 2.0) - jwt (>= 1.5, < 3.0) - multi_json (~> 1.10) - simctl (1.6.8) - CFPropertyList - naturally - terminal-notifier (2.0.0) - terminal-table (1.8.0) - unicode-display_width (~> 1.1, >= 1.1.1) - trailblazer-option (0.1.2) - tty-cursor (0.7.1) - tty-screen (0.8.1) - tty-spinner (0.9.3) - tty-cursor (~> 0.7) - uber (0.1.0) - unf (0.1.4) - unf_ext - unf_ext (0.0.8) - unicode-display_width (1.8.0) - webrick (1.7.0) - word_wrap (1.0.0) - xcodeproj (1.21.0) - CFPropertyList (>= 2.3.3, < 4.0) - atomos (~> 0.1.3) - claide (>= 1.0.2, < 2.0) - colored2 (~> 3.1) - nanaimo (~> 0.3.0) - rexml (~> 3.2.4) - xcpretty (0.3.0) - rouge (~> 2.0.7) - xcpretty-travis-formatter (1.0.1) - xcpretty (~> 0.2, >= 0.0.7) - -PLATFORMS - ruby - -DEPENDENCIES - fastlane - fastlane-plugin-badge - -RUBY VERSION - ruby 2.7.1p83 - -BUNDLED WITH - 2.3.7 diff --git a/tests/test-app-jdk-8/app/.gitignore b/tests/test-app-jdk-8/app/.gitignore deleted file mode 100644 index 796b96d..0000000 --- a/tests/test-app-jdk-8/app/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build diff --git a/tests/test-app-jdk-8/app/build.gradle b/tests/test-app-jdk-8/app/build.gradle deleted file mode 100644 index 8cad1d5..0000000 --- a/tests/test-app-jdk-8/app/build.gradle +++ /dev/null @@ -1,40 +0,0 @@ -apply plugin: 'com.android.application' -apply plugin: 'kotlin-android' -apply plugin: 'kotlin-kapt' -apply plugin: 'kotlin-android-extensions' - -android { - compileSdkVersion System.getenv("COMPILE_SDK_VERSION") as Integer - buildToolsVersion System.getenv("BUILD_TOOLS_VERSION") - - defaultConfig { - applicationId "com.fabernovel.testapp" - minSdkVersion System.getenv("MIN_SDK_VERSION") as Integer - targetSdkVersion System.getenv("TARGET_SDK_VERSION") as Integer - versionCode 1 - versionName "1.0" - - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" - } - - buildTypes { - release { - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - } - } -} - -dependencies { - implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" - implementation 'androidx.appcompat:appcompat:1.0.2' - implementation 'androidx.core:core-ktx:1.2.0' - implementation 'androidx.constraintlayout:constraintlayout:1.1.3' - testImplementation 'junit:junit:4.12' - androidTestImplementation 'androidx.test.ext:junit:1.1.1' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' - - kapt "io.norberg:auto-matter:0.15.0" - implementation "io.norberg:auto-matter-gson:0.15.0" -} diff --git a/tests/test-app-jdk-8/app/proguard-rules.pro b/tests/test-app-jdk-8/app/proguard-rules.pro deleted file mode 100644 index f1b4245..0000000 --- a/tests/test-app-jdk-8/app/proguard-rules.pro +++ /dev/null @@ -1,21 +0,0 @@ -# Add project specific ProGuard rules here. -# You can control the set of applied configuration files using the -# proguardFiles setting in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} - -# Uncomment this to preserve the line number information for -# debugging stack traces. -#-keepattributes SourceFile,LineNumberTable - -# If you keep the line number information, uncomment this to -# hide the original source file name. -#-renamesourcefileattribute SourceFile diff --git a/tests/test-app-jdk-8/app/src/androidTest/java/com/fabernovel/testapp/ExampleInstrumentedTest.kt b/tests/test-app-jdk-8/app/src/androidTest/java/com/fabernovel/testapp/ExampleInstrumentedTest.kt deleted file mode 100644 index 1112f00..0000000 --- a/tests/test-app-jdk-8/app/src/androidTest/java/com/fabernovel/testapp/ExampleInstrumentedTest.kt +++ /dev/null @@ -1,24 +0,0 @@ -package com.fabernovel.testapp - -import androidx.test.platform.app.InstrumentationRegistry -import androidx.test.ext.junit.runners.AndroidJUnit4 - -import org.junit.Test -import org.junit.runner.RunWith - -import org.junit.Assert.* - -/** - * Instrumented test, which will execute on an Android device. - * - * See [testing documentation](http://d.android.com/tools/testing). - */ -@RunWith(AndroidJUnit4::class) -class ExampleInstrumentedTest { - @Test - fun useAppContext() { - // Context of the app under test. - val appContext = InstrumentationRegistry.getInstrumentation().targetContext - assertEquals("com.fabernovel.testapp", appContext.packageName) - } -} diff --git a/tests/test-app-jdk-8/app/src/main/AndroidManifest.xml b/tests/test-app-jdk-8/app/src/main/AndroidManifest.xml deleted file mode 100644 index 96248cc..0000000 --- a/tests/test-app-jdk-8/app/src/main/AndroidManifest.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tests/test-app-jdk-8/app/src/main/java/com/fabernovel/testapp/MainActivity.kt b/tests/test-app-jdk-8/app/src/main/java/com/fabernovel/testapp/MainActivity.kt deleted file mode 100644 index d19fd5b..0000000 --- a/tests/test-app-jdk-8/app/src/main/java/com/fabernovel/testapp/MainActivity.kt +++ /dev/null @@ -1,19 +0,0 @@ -package com.fabernovel.testapp - -import android.os.Bundle -import androidx.appcompat.app.AppCompatActivity -import kotlinx.android.synthetic.main.activity_main.* - -class MainActivity : AppCompatActivity() { - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - setContentView(R.layout.activity_main) - - val message = MessageBuilder() - .value("Hello JDK8!") - .build() - - welcome.text = message.value() - } -} diff --git a/tests/test-app-jdk-8/app/src/main/java/com/fabernovel/testapp/Message.kt b/tests/test-app-jdk-8/app/src/main/java/com/fabernovel/testapp/Message.kt deleted file mode 100644 index 08b5c67..0000000 --- a/tests/test-app-jdk-8/app/src/main/java/com/fabernovel/testapp/Message.kt +++ /dev/null @@ -1,8 +0,0 @@ -package com.fabernovel.testapp - -import io.norberg.automatter.AutoMatter - -@AutoMatter -interface Message { - fun value(): String -} diff --git a/tests/test-app-jdk-8/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/tests/test-app-jdk-8/app/src/main/res/drawable-v24/ic_launcher_foreground.xml deleted file mode 100644 index 381b4c3..0000000 --- a/tests/test-app-jdk-8/app/src/main/res/drawable-v24/ic_launcher_foreground.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/tests/test-app-jdk-8/app/src/main/res/drawable/ic_launcher_background.xml b/tests/test-app-jdk-8/app/src/main/res/drawable/ic_launcher_background.xml deleted file mode 100644 index aa30557..0000000 --- a/tests/test-app-jdk-8/app/src/main/res/drawable/ic_launcher_background.xml +++ /dev/null @@ -1,205 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/test-app-jdk-8/app/src/main/res/layout/activity_main.xml b/tests/test-app-jdk-8/app/src/main/res/layout/activity_main.xml deleted file mode 100644 index 6663829..0000000 --- a/tests/test-app-jdk-8/app/src/main/res/layout/activity_main.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - diff --git a/tests/test-app-jdk-8/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/tests/test-app-jdk-8/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml deleted file mode 100644 index 9f69274..0000000 --- a/tests/test-app-jdk-8/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/tests/test-app-jdk-8/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/tests/test-app-jdk-8/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml deleted file mode 100644 index 9f69274..0000000 --- a/tests/test-app-jdk-8/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/tests/test-app-jdk-8/app/src/main/res/mipmap-hdpi/ic_launcher.png b/tests/test-app-jdk-8/app/src/main/res/mipmap-hdpi/ic_launcher.png deleted file mode 100644 index a571e60..0000000 Binary files a/tests/test-app-jdk-8/app/src/main/res/mipmap-hdpi/ic_launcher.png and /dev/null differ diff --git a/tests/test-app-jdk-8/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/tests/test-app-jdk-8/app/src/main/res/mipmap-hdpi/ic_launcher_round.png deleted file mode 100644 index 61da551..0000000 Binary files a/tests/test-app-jdk-8/app/src/main/res/mipmap-hdpi/ic_launcher_round.png and /dev/null differ diff --git a/tests/test-app-jdk-8/app/src/main/res/mipmap-mdpi/ic_launcher.png b/tests/test-app-jdk-8/app/src/main/res/mipmap-mdpi/ic_launcher.png deleted file mode 100644 index c41dd28..0000000 Binary files a/tests/test-app-jdk-8/app/src/main/res/mipmap-mdpi/ic_launcher.png and /dev/null differ diff --git a/tests/test-app-jdk-8/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/tests/test-app-jdk-8/app/src/main/res/mipmap-mdpi/ic_launcher_round.png deleted file mode 100644 index db5080a..0000000 Binary files a/tests/test-app-jdk-8/app/src/main/res/mipmap-mdpi/ic_launcher_round.png and /dev/null differ diff --git a/tests/test-app-jdk-8/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/tests/test-app-jdk-8/app/src/main/res/mipmap-xhdpi/ic_launcher.png deleted file mode 100644 index 6dba46d..0000000 Binary files a/tests/test-app-jdk-8/app/src/main/res/mipmap-xhdpi/ic_launcher.png and /dev/null differ diff --git a/tests/test-app-jdk-8/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/tests/test-app-jdk-8/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png deleted file mode 100644 index da31a87..0000000 Binary files a/tests/test-app-jdk-8/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png and /dev/null differ diff --git a/tests/test-app-jdk-8/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/tests/test-app-jdk-8/app/src/main/res/mipmap-xxhdpi/ic_launcher.png deleted file mode 100644 index 15ac681..0000000 Binary files a/tests/test-app-jdk-8/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and /dev/null differ diff --git a/tests/test-app-jdk-8/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/tests/test-app-jdk-8/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png deleted file mode 100644 index b216f2d..0000000 Binary files a/tests/test-app-jdk-8/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png and /dev/null differ diff --git a/tests/test-app-jdk-8/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/tests/test-app-jdk-8/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png deleted file mode 100644 index f25a419..0000000 Binary files a/tests/test-app-jdk-8/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and /dev/null differ diff --git a/tests/test-app-jdk-8/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/tests/test-app-jdk-8/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png deleted file mode 100644 index e96783c..0000000 Binary files a/tests/test-app-jdk-8/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png and /dev/null differ diff --git a/tests/test-app-jdk-8/app/src/main/res/values/colors.xml b/tests/test-app-jdk-8/app/src/main/res/values/colors.xml deleted file mode 100644 index 030098f..0000000 --- a/tests/test-app-jdk-8/app/src/main/res/values/colors.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - #6200EE - #3700B3 - #03DAC5 - diff --git a/tests/test-app-jdk-8/app/src/main/res/values/strings.xml b/tests/test-app-jdk-8/app/src/main/res/values/strings.xml deleted file mode 100644 index 5d6a4c1..0000000 --- a/tests/test-app-jdk-8/app/src/main/res/values/strings.xml +++ /dev/null @@ -1,3 +0,0 @@ - - TestApp - diff --git a/tests/test-app-jdk-8/app/src/main/res/values/styles.xml b/tests/test-app-jdk-8/app/src/main/res/values/styles.xml deleted file mode 100644 index 5885930..0000000 --- a/tests/test-app-jdk-8/app/src/main/res/values/styles.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - diff --git a/tests/test-app-jdk-8/app/src/test/java/com/fabernovel/testapp/ExampleUnitTest.kt b/tests/test-app-jdk-8/app/src/test/java/com/fabernovel/testapp/ExampleUnitTest.kt deleted file mode 100644 index 39b2d68..0000000 --- a/tests/test-app-jdk-8/app/src/test/java/com/fabernovel/testapp/ExampleUnitTest.kt +++ /dev/null @@ -1,17 +0,0 @@ -package com.fabernovel.testapp - -import org.junit.Test - -import org.junit.Assert.* - -/** - * Example local unit test, which will execute on the development machine (host). - * - * See [testing documentation](http://d.android.com/tools/testing). - */ -class ExampleUnitTest { - @Test - fun addition_isCorrect() { - assertEquals(4, 2 + 2) - } -} diff --git a/tests/test-app-jdk-8/build.gradle b/tests/test-app-jdk-8/build.gradle deleted file mode 100644 index 7080069..0000000 --- a/tests/test-app-jdk-8/build.gradle +++ /dev/null @@ -1,29 +0,0 @@ -// Top-level build file where you can add configuration options common to all sub-projects/modules. - -buildscript { - ext.kotlin_version = System.getenv("KOTLIN_VERSION") - repositories { - google() - jcenter() - - } - dependencies { - classpath("com.android.tools.build:gradle:${System.getenv("ANDROID_GRADLE_TOOLS_VERSION")}") - classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version") - - // NOTE: Do not place your application dependencies here; they belong - // in the individual module build.gradle files - } -} - -allprojects { - repositories { - google() - jcenter() - - } -} - -task clean(type: Delete) { - delete rootProject.buildDir -} diff --git a/tests/test-app-jdk-8/fastlane/Appfile b/tests/test-app-jdk-8/fastlane/Appfile deleted file mode 100644 index cb953b9..0000000 --- a/tests/test-app-jdk-8/fastlane/Appfile +++ /dev/null @@ -1,2 +0,0 @@ -json_key_file("") # Path to the json secret file - Follow https://docs.fastlane.tools/actions/supply/#setup to get one -package_name("com.fabernovel.testapp") # e.g. com.krausefx.app diff --git a/tests/test-app-jdk-8/fastlane/Fastfile b/tests/test-app-jdk-8/fastlane/Fastfile deleted file mode 100644 index 46d7bf1..0000000 --- a/tests/test-app-jdk-8/fastlane/Fastfile +++ /dev/null @@ -1,22 +0,0 @@ -# This file contains the fastlane.tools configuration -# You can find the documentation at https://docs.fastlane.tools -# -# For a list of all available actions, check out -# -# https://docs.fastlane.tools/actions -# -# For a list of all available plugins, check out -# -# https://docs.fastlane.tools/plugins/available-plugins -# - -# Uncomment the line if you want fastlane to automatically update itself -# update_fastlane - -default_platform(:android) - -platform :android do - lane :build do - gradle(task: "assemble") - end -end diff --git a/tests/test-app-jdk-8/fastlane/Pluginfile b/tests/test-app-jdk-8/fastlane/Pluginfile deleted file mode 100644 index 781fae2..0000000 --- a/tests/test-app-jdk-8/fastlane/Pluginfile +++ /dev/null @@ -1,5 +0,0 @@ -# Autogenerated by fastlane -# -# Ensure this file is checked in to source control! - -gem 'fastlane-plugin-badge' diff --git a/tests/test-app-jdk-8/gradle.properties b/tests/test-app-jdk-8/gradle.properties deleted file mode 100644 index 23339e0..0000000 --- a/tests/test-app-jdk-8/gradle.properties +++ /dev/null @@ -1,21 +0,0 @@ -# Project-wide Gradle settings. -# IDE (e.g. Android Studio) users: -# Gradle settings configured through the IDE *will override* -# any settings specified in this file. -# For more details on how to configure your build environment visit -# http://www.gradle.org/docs/current/userguide/build_environment.html -# Specifies the JVM arguments used for the daemon process. -# The setting is particularly useful for tweaking memory settings. -org.gradle.jvmargs=-Xmx1536m -# When configured, Gradle will run in incubating parallel mode. -# This option should only be used with decoupled projects. More details, visit -# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects -# org.gradle.parallel=true -# AndroidX package structure to make it clearer which packages are bundled with the -# Android operating system, and which are packaged with your app's APK -# https://developer.android.com/topic/libraries/support-library/androidx-rn -android.useAndroidX=true -# Automatically convert third-party libraries to use AndroidX -android.enableJetifier=true -# Kotlin code style for this project: "official" or "obsolete": -kotlin.code.style=official diff --git a/tests/test-app-jdk-8/gradle/wrapper/gradle-wrapper.jar b/tests/test-app-jdk-8/gradle/wrapper/gradle-wrapper.jar deleted file mode 100644 index f6b961f..0000000 Binary files a/tests/test-app-jdk-8/gradle/wrapper/gradle-wrapper.jar and /dev/null differ diff --git a/tests/test-app-jdk-8/gradle/wrapper/gradle-wrapper.properties b/tests/test-app-jdk-8/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index 69e20ab..0000000 --- a/tests/test-app-jdk-8/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,5 +0,0 @@ -#Thu Feb 27 14:01:23 CET 2020 -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists diff --git a/tests/test-app-jdk-8/gradlew b/tests/test-app-jdk-8/gradlew deleted file mode 100755 index cccdd3d..0000000 --- a/tests/test-app-jdk-8/gradlew +++ /dev/null @@ -1,172 +0,0 @@ -#!/usr/bin/env sh - -############################################################################## -## -## Gradle start up script for UN*X -## -############################################################################## - -# Attempt to set APP_HOME -# Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi -done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null - -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="" - -# Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" - -warn () { - echo "$*" -} - -die () { - echo - echo "$*" - echo - exit 1 -} - -# OS specific support (must be 'true' or 'false'). -cygwin=false -msys=false -darwin=false -nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; -esac - -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar - -# Determine the Java command to use to start the JVM. -if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" - else - JAVACMD="$JAVA_HOME/bin/java" - fi - if [ ! -x "$JAVACMD" ] ; then - die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." - fi -else - JAVACMD="java" - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." -fi - -# Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi -fi - -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi - -# For Cygwin, switch paths to Windows format before running java -if $cygwin ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi - # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" - fi - i=$((i+1)) - done - case $i in - (0) set -- ;; - (1) set -- "$args0" ;; - (2) set -- "$args0" "$args1" ;; - (3) set -- "$args0" "$args1" "$args2" ;; - (4) set -- "$args0" "$args1" "$args2" "$args3" ;; - (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac -fi - -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=$(save "$@") - -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" - -# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong -if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then - cd "$(dirname "$0")" -fi - -exec "$JAVACMD" "$@" diff --git a/tests/test-app-jdk-8/gradlew.bat b/tests/test-app-jdk-8/gradlew.bat deleted file mode 100644 index e95643d..0000000 --- a/tests/test-app-jdk-8/gradlew.bat +++ /dev/null @@ -1,84 +0,0 @@ -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS= - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto init - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:init -@rem Get command-line arguments, handling Windows variants - -if not "%OS%" == "Windows_NT" goto win9xME_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega diff --git a/tests/test-app-jdk-8/settings.gradle b/tests/test-app-jdk-8/settings.gradle deleted file mode 100644 index f67a5f0..0000000 --- a/tests/test-app-jdk-8/settings.gradle +++ /dev/null @@ -1,2 +0,0 @@ -rootProject.name='TestApp' -include ':app' diff --git a/tests/test-app-ndk/app/build.gradle b/tests/test-app-ndk/app/build.gradle index 2eb9866..e4d97d2 100644 --- a/tests/test-app-ndk/app/build.gradle +++ b/tests/test-app-ndk/app/build.gradle @@ -1,8 +1,8 @@ apply plugin: 'com.android.application' apply plugin: 'kotlin-android' -apply plugin: 'kotlin-android-extensions' android { + namespace 'com.fabernovel.testndkapp' compileSdkVersion System.getenv("COMPILE_SDK_VERSION") as Integer buildToolsVersion System.getenv("BUILD_TOOLS_VERSION") @@ -10,7 +10,6 @@ android { applicationId "com.fabernovel.testndkapp" minSdkVersion System.getenv("MIN_SDK_VERSION") as Integer targetSdkVersion System.getenv("TARGET_SDK_VERSION") as Integer - versionCode 1 versionName "1.0" @@ -23,6 +22,10 @@ android { } } + buildFeatures { + viewBinding true + } + buildTypes { release { minifyEnabled false @@ -31,6 +34,14 @@ android { } } + compileOptions { + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 + } + kotlinOptions { + jvmTarget = "17" + } + ndkVersion System.getenv("NDK_VERSION") externalNativeBuild { diff --git a/tests/test-app-ndk/app/src/main/AndroidManifest.xml b/tests/test-app-ndk/app/src/main/AndroidManifest.xml index 8c13328..31c97d3 100644 --- a/tests/test-app-ndk/app/src/main/AndroidManifest.xml +++ b/tests/test-app-ndk/app/src/main/AndroidManifest.xml @@ -1,8 +1,6 @@ + xmlns:android="http://schemas.android.com/apk/res/android">