diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2529f03cf..2f7844726 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,14 +14,14 @@ jobs: env: COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }} - runs-on: macos-latest + runs-on: macos-13 steps: - uses: actions/checkout@v2 - - name: Set up JDK 11 + - name: Set up JDK 17 uses: actions/setup-java@v1 with: - java-version: 11 + java-version: 17 - name: Create local.properties file run: touch local.properties && echo "mapbox.repo.token=${{ secrets.MAPBOX_SDK_REPO_TOKEN }}" >> local.properties - name: Print Java version @@ -40,10 +40,14 @@ jobs: uses: reactivecircus/android-emulator-runner@v2 with: api-level: 22 + arch: x86_64 + force-avd-creation: true + emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none + disable-animations: true script: ./gradlew connectedDebug --stacktrace --info - name: Run jacocoTestReport for each module run: ./gradlew jacocoTestReport --stacktrace --info - name: Merge jacoco reports from all modules run: ./gradlew jacocoFullReport --stacktrace - name: Upload coverage to Coveralls with Gradle - run: ./gradlew coveralls --stacktrace \ No newline at end of file + run: ./gradlew coveralls --stacktrace diff --git a/.github/workflows/library.yml b/.github/workflows/library.yml index cb2b58620..bb22ee8b9 100644 --- a/.github/workflows/library.yml +++ b/.github/workflows/library.yml @@ -22,7 +22,7 @@ jobs: - name: Cancel previous workflow runs uses: styfle/cancel-workflow-action@0.9.1 with: - access_token: ${{ github.token }} + access_token: ${{ github.token }} - name: Checkout 🛎️ uses: actions/checkout@v2 @@ -55,15 +55,15 @@ jobs: - name: Build project skipping tests run: ./gradlew build -x test --stacktrace - - name: Run Instrumented Tests manually - uses: reactivecircus/android-emulator-runner@v2 - with: - api-level: 22 - script: ./gradlew :library:connectedDebug --stacktrace --info - - - name: Run unit tests with Gradle - run: ./gradlew :library:clean :library:testDebugUnitTest --stacktrace - +# - name: Run Instrumented Tests manually +# uses: reactivecircus/android-emulator-runner@v2 +# with: +# api-level: 22 +# script: ./gradlew :library:connectedDebug --stacktrace --info +# +# - name: Run unit tests with Gradle +# run: ./gradlew :library:clean :library:testDebugUnitTest --stacktrace + - name: Generate & upload library snapshot artifact AAR (Android Archive) file run: ./gradlew :library:clean --stacktrace && ./gradlew :library:assembleRelease --stacktrace && ./gradlew :library:publishMavenJavaPublicationToMavenCentralRepository --stacktrace diff --git a/.github/workflows/utils.yml b/.github/workflows/utils.yml index e4d1a0f49..5bbcf8469 100644 --- a/.github/workflows/utils.yml +++ b/.github/workflows/utils.yml @@ -29,10 +29,10 @@ jobs: with: fetch-depth: 2 - - name: Set up JDK 11 + - name: Set up JDK 17 uses: actions/setup-java@v1 with: - java-version: 11 + java-version: 17 - name: Create local.properties file run: touch local.properties && echo "mapbox.repo.token=${{ secrets.MAPBOX_SDK_REPO_TOKEN }}" >> local.properties @@ -70,4 +70,4 @@ jobs: - name: Github Release uses: softprops/action-gh-release@v1 with: - prerelease: ${{ contains(github.ref, '-alpha') || contains(github.ref, '-beta') }} \ No newline at end of file + prerelease: ${{ contains(github.ref, '-alpha') || contains(github.ref, '-beta') }} diff --git a/build.gradle b/build.gradle index 9000cc0b5..7457e1ccb 100644 --- a/build.gradle +++ b/build.gradle @@ -28,6 +28,7 @@ allprojects { repositories { google() jcenter() + mavenCentral() mavenLocal() maven { url "https://jitpack.io" } maven { @@ -46,6 +47,8 @@ allprojects { password = localProperties['mapbox.repo.token'] ?: "" } } + maven{url "https://oss.sonatype.org/content/repositories/snapshots"} + maven{url "https://s01.oss.sonatype.org/content/repositories/snapshots"} } } diff --git a/configs.gradle b/configs.gradle index d76b42003..8c7338293 100644 --- a/configs.gradle +++ b/configs.gradle @@ -105,13 +105,13 @@ ext { // Dependency and other versions androidxTestCoreVersion = "1.4.0" buildToolsVersion = "30.0.3" - compileSdkVersion = 28 + compileSdkVersion = 34 jacocoVersion = "0.8.8" junitVersion = "4.12" mapboxAnnotationPluginVersion = "0.9.0" mapboxSdkVersion = "9.7.1" - robolectricShadowsMultidexVersion = "4.3.1" - robolectricVersion = "4.3.1" + robolectricShadowsMultidexVersion = "4.7.3" + robolectricVersion = "4.7.3" supportVersion = "1.0.0" volleyVersion = "1.2.0" targetSdkVersion = 27 diff --git a/download-robolectric-deps.sh b/download-robolectric-deps.sh index e5dcd5394..a484014d7 100755 --- a/download-robolectric-deps.sh +++ b/download-robolectric-deps.sh @@ -2,6 +2,7 @@ mkdir robolectric-deps wget -nc https://repo1.maven.org/maven2/org/robolectric/android-all/10-robolectric-5803371/android-all-10-robolectric-5803371.jar -P robolectric-deps wget -nc https://repo1.maven.org/maven2/org/robolectric/android-all/8.1.0-robolectric-4611349/android-all-8.1.0-robolectric-4611349.jar -P robolectric-deps +wget -nc https://repo1.maven.org/maven2/org/robolectric/android-all-instrumented/8.1.0-robolectric-4611349-i3/android-all-instrumented-8.1.0-robolectric-4611349-i3.jar -P robolectric-deps wget -nc https://repo1.maven.org/maven2/org/robolectric/android-all/8.0.0_r4-robolectric-r1/android-all-8.0.0_r4-robolectric-r1.jar -P robolectric-deps wget -nc https://repo1.maven.org/maven2/org/robolectric/android-all/6.0.1_r3-robolectric-r1/android-all-6.0.1_r3-robolectric-r1.jar -P robolectric-deps @@ -12,5 +13,4 @@ wget -nc https://repo1.maven.org/maven2/org/robolectric/android-all/11-robolectr cp robolectric-deps.properties library/src/test/resources cp robolectric-deps.properties utils/src/test/resources -cp robolectric-deps.properties sample/src/test/resources -cp robolectric-deps.properties wrapper/src/test/resources \ No newline at end of file +cp robolectric-deps.properties sample/src/test/resources \ No newline at end of file diff --git a/library/build.gradle b/library/build.gradle index a15be341f..91edcfa48 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -3,6 +3,7 @@ apply plugin: 'jacoco' buildscript { repositories { + mavenCentral() jcenter() } dependencies { @@ -14,7 +15,7 @@ apply plugin: 'realm-android' apply plugin: 'com.jfrog.bintray' apply plugin: 'maven-publish' -version '0.10.0' +version '0.10.5-SNAPSHOT' project.version = this.version @@ -33,7 +34,7 @@ android { } defaultConfig { - minSdkVersion 16 + minSdkVersion 19 targetSdkVersion rootProject.ext.targetSdkVersion versionCode 1 versionName this.version @@ -118,7 +119,7 @@ dependencies { configuration -> // Comment the line below when creating releases - The line is for development of the library & utils implementation (project(":utils")) { // Uncomment the line below when creating releases - //implementation('io.ona.kujaku:utils:0.9.0') { + //implementation('io.ona.kujaku:utils:0.10.5-SNAPSHOT') { transitive = true; exclude group: 'com.mapbox.mapboxsdk', module: 'mapbox-android-sdk' exclude group: 'com.android.support', module: 'support-v4' @@ -173,7 +174,7 @@ private static void appPermissionsDependencies(configuration) { } private static void locationDependencies(configuration) { - configuration.implementation 'com.google.android.gms:play-services-location:19.0.1' + configuration.implementation 'com.google.android.gms:play-services-location:21.2.0' } tasks.withType(Test) { diff --git a/library/src/main/AndroidManifest.xml b/library/src/main/AndroidManifest.xml index 022be0261..0e9b26c6d 100644 --- a/library/src/main/AndroidManifest.xml +++ b/library/src/main/AndroidManifest.xml @@ -7,8 +7,11 @@ - - + + + diff --git a/library/src/main/java/io/ona/kujaku/helpers/PermissionsHelper.java b/library/src/main/java/io/ona/kujaku/helpers/PermissionsHelper.java index ceff88c49..2ba9daa5d 100644 --- a/library/src/main/java/io/ona/kujaku/helpers/PermissionsHelper.java +++ b/library/src/main/java/io/ona/kujaku/helpers/PermissionsHelper.java @@ -3,6 +3,7 @@ import android.Manifest; import android.app.Activity; import android.content.Context; +import android.os.Build; import android.util.Log; import com.karumi.dexter.Dexter; @@ -19,7 +20,7 @@ public static void checkPermissions(String TAG, Context context) { MultiplePermissionsListener dialogMultiplePermissionListener = new KujakuMultiplePermissionListener(activity); Dexter.withActivity(activity) - .withPermissions(Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.WRITE_EXTERNAL_STORAGE) + .withPermissions(Manifest.permission.ACCESS_FINE_LOCATION, (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) ? Manifest.permission.MANAGE_EXTERNAL_STORAGE : Manifest.permission.WRITE_EXTERNAL_STORAGE) .withListener(dialogMultiplePermissionListener) .check(); diff --git a/library/src/main/java/io/ona/kujaku/utils/KujakuMultiplePermissionListener.java b/library/src/main/java/io/ona/kujaku/utils/KujakuMultiplePermissionListener.java index 8947be608..6e8de86df 100644 --- a/library/src/main/java/io/ona/kujaku/utils/KujakuMultiplePermissionListener.java +++ b/library/src/main/java/io/ona/kujaku/utils/KujakuMultiplePermissionListener.java @@ -34,9 +34,6 @@ public void onPermissionsChecked(MultiplePermissionsReport report) { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - if (context instanceof Activity) { - ((Activity) context).finish(); - } } }) .show(); diff --git a/library/src/main/java/io/ona/kujaku/utils/Permissions.java b/library/src/main/java/io/ona/kujaku/utils/Permissions.java index 68e4546b0..24d9ebe5b 100644 --- a/library/src/main/java/io/ona/kujaku/utils/Permissions.java +++ b/library/src/main/java/io/ona/kujaku/utils/Permissions.java @@ -5,6 +5,8 @@ import android.content.Context; import android.content.Intent; import android.content.pm.PackageManager; +import android.os.Build; + import androidx.core.app.ActivityCompat; import androidx.core.content.ContextCompat; @@ -16,30 +18,40 @@ */ public class Permissions { - private static final String[] CRITICAL_PERMISSIONS = new String[]{ - Manifest.permission.READ_EXTERNAL_STORAGE, - Manifest.permission.WRITE_EXTERNAL_STORAGE - }; /** * Returns {@link android.content.pm.PermissionInfo#PROTECTION_DANGEROUS} permissions which - * have not been requested yet/denied by the user from the list of {@link Permissions#CRITICAL_PERMISSIONS} + * have not been requested yet/denied by the user from the list of {@link Permissions} * required * * @param context * @return list of unauthorised permissions */ public static String[] getUnauthorizedCriticalPermissions(Context context) { + String[] criticalPermissions; + + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) { // Android 13 (API 33) + criticalPermissions = new String[]{ + Manifest.permission.MANAGE_EXTERNAL_STORAGE + }; + } else { + criticalPermissions = new String[]{ + Manifest.permission.READ_EXTERNAL_STORAGE, + Manifest.permission.WRITE_EXTERNAL_STORAGE + }; + } + List unauthorizedPermissions = new ArrayList<>(); - for (String curPermission : CRITICAL_PERMISSIONS) { + for (String curPermission : criticalPermissions) { if (!check(context, curPermission)) { unauthorizedPermissions.add(curPermission); } } - return unauthorizedPermissions.toArray(new String[]{}); + return unauthorizedPermissions.toArray(new String[0]); } + /** * Checks if a specific application permission is authorised * diff --git a/robolectric-deps.properties b/robolectric-deps.properties index 43437be27..7d9781e1b 100644 --- a/robolectric-deps.properties +++ b/robolectric-deps.properties @@ -3,6 +3,11 @@ org.robolectric\:android-all\:7.0.0_r1-robolectric-r1=../../../../../../robolect org.robolectric\:android-all\:7.1.0_r7-robolectric-r1=../../../../../../robolectric-deps/android-all-7.1.0_r7-robolectric-r1.jar org.robolectric\:android-all\:8.0.0_r4-robolectric-r1=../../../../../../robolectric-deps/android-all-8.0.0_r4-robolectric-r1.jar org.robolectric\:android-all\:8.1.0-robolectric-4611349=../../../../../../robolectric-deps/android-all-8.1.0-robolectric-4611349.jar +org.robolectric\:android-all-instrumented\:8.1.0-robolectric-4611349=../../../../../../robolectric-deps/android-all-instrumented-8.1.0-robolectric-4611349.jar +org.robolectric\:android-all-instrumented\:8.0.0_r4-robolectric-r1-i3=../../../../../../robolectric-deps/android-all-instrumented-8.0.0_r4-robolectric-r1-i3.jar +org.robolectric\:android-all-instrumented\:7.1.0_r7-robolectric-r1-i3=../../../../../../robolectric-deps/android-all-instrumented-7.1.0_r7-robolectric-r1-i3.jar +org.robolectric\:android-all-instrumented\:8.1.0-robolectric-4611349-i3=../../../../../../robolectric-deps/android-all-instrumented-8.1.0-robolectric-4611349-i3.jar +org.robolectric\:android-all-instrumented\:12-robolectric-7732740-i3=../../../../../../robolectric-deps/android-all-instrumented-12-robolectric-7732740-i3.jar org.robolectric\:android-all\:9-robolectric-4913185-2=../../../../../../robolectric-deps/android-all-9-robolectric-4913185-2.jar org.robolectric\:android-all\:10-robolectric-5803371=../../../../../../robolectric-deps/android-all-10-robolectric-5803371.jar org.robolectric\:android-all\:11-robolectric-6757853=../../../../../../robolectric-deps/android-all-11-robolectric-6757853.jar \ No newline at end of file diff --git a/sample/.gitignore b/sample/.gitignore index 796b96d1c..98885c50a 100644 --- a/sample/.gitignore +++ b/sample/.gitignore @@ -1 +1,4 @@ /build + +# Local configuration file (sdk path, etc) +local.properties diff --git a/sample/build.gradle b/sample/build.gradle index 30573d486..784254475 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -18,7 +18,7 @@ android { defaultConfig { applicationId "io.ona.kujaku.sample" - minSdkVersion 16 + minSdkVersion 21 targetSdkVersion rootProject.ext.targetSdkVersion versionCode getMasterCommitCount() versionName getVersionName() diff --git a/sample/src/main/AndroidManifest.xml b/sample/src/main/AndroidManifest.xml index 49fc5d123..9908013bf 100644 --- a/sample/src/main/AndroidManifest.xml +++ b/sample/src/main/AndroidManifest.xml @@ -2,6 +2,12 @@ + + + + + + notGivenPermissions = new ArrayList<>(); + String[] basicPermissions; + + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) { // Android 13 (API 33) + basicPermissions = new String[]{ + Manifest.permission.MANAGE_EXTERNAL_STORAGE + }; + } else { + basicPermissions = new String[]{ + Manifest.permission.READ_EXTERNAL_STORAGE, + Manifest.permission.WRITE_EXTERNAL_STORAGE + }; + } for (String permission : basicPermissions) { if (!Permissions.check(this, permission)) { @@ -497,8 +507,8 @@ private void requestBasicPermissions() { } } - if (notGivenPermissions.size() > 0) { - Permissions.request(this, notGivenPermissions.toArray(new String[notGivenPermissions.size()]), PERMISSIONS_REQUEST_CODE); + if (!notGivenPermissions.isEmpty()) { + Permissions.request(this, notGivenPermissions.toArray(new String[0]), PERMISSIONS_REQUEST_CODE); } else { confirmSampleStyleAvailable(); } diff --git a/settings.gradle b/settings.gradle index f7a0a7526..f904d5b1b 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1 @@ -include ':library', ':sample', ':wrapper', ':utils' +include ':library', ':sample', ':utils' diff --git a/utils/build.gradle b/utils/build.gradle index d701fd76d..63e8317aa 100644 --- a/utils/build.gradle +++ b/utils/build.gradle @@ -3,7 +3,7 @@ apply plugin: 'com.jfrog.bintray' apply plugin: 'maven-publish' apply plugin: 'jacoco' -version '0.9.0' +version '0.10.5-SNAPSHOT' project.version = this.version @@ -22,7 +22,7 @@ android { } defaultConfig { - minSdkVersion 16 + minSdkVersion 19 targetSdkVersion rootProject.ext.targetSdkVersion versionCode 1 versionName this.version diff --git a/wrapper/.gitignore b/wrapper/.gitignore deleted file mode 100644 index 796b96d1c..000000000 --- a/wrapper/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build diff --git a/wrapper/build.gradle b/wrapper/build.gradle deleted file mode 100644 index 3ca288ace..000000000 --- a/wrapper/build.gradle +++ /dev/null @@ -1,87 +0,0 @@ -apply plugin: 'com.android.application' -apply plugin: 'jacoco' - -jacoco { - toolVersion = jacocoVersion -} - -android { - compileSdkVersion rootProject.ext.compileSdkVersion - buildToolsVersion rootProject.ext.buildToolsVersion - - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 - } - - defaultConfig { - applicationId "io.ona.kujaku.wrapper" - minSdkVersion 16 - targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 1 - versionName "1.0" - - testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' - multiDexEnabled true - } - - buildTypes { - release { - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' - } - - debug { - // See bug https://github.com/vanniktech/gradle-android-junit-jacoco-plugin/issues/183 - testCoverageEnabled false - } - } - - lintOptions { - abortOnError false - } -} - -dependencies { - implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation 'androidx.lifecycle:lifecycle-runtime:2.0.0' - - implementation (project(':library')) { - exclude group: 'com.google.code.findbugs', module: 'jsr305' - } - androidTestImplementation ('androidx.test.espresso:espresso-core:3.1.0', { - exclude group: 'com.android.support', module: 'support-annotations' - }) - implementation 'androidx.appcompat:appcompat:1.0.0' - testImplementation junit - - implementation 'androidx.multidex:multidex:2.0.0' -} - -tasks.withType(Test) { - jacoco.includeNoLocationClasses = true - jacoco.excludes = ['jdk.internal.*'] -} - -// createDebugCoverageReport is not available when android.buildTypes.debug.testCoverageEnabled is false -task jacocoTestReport(type: JacocoReport, dependsOn: ['testDebugUnitTest']) { //, 'createDebugCoverageReport']) { - - reports { - xml.enabled = true - html.enabled = true - } - - getReports().getXml().setDestination(file("${buildDir}/reports/jacoco/jacocoRootReport/merged.xml")) - getReports().getHtml().setDestination(file("${buildDir}/reports/jacoco/jacocoRootReport/html")) - - def fileFilter = ['**/R.class', '**/R$*.class', '**/BuildConfig.*', '**/Manifest*.*', '**/*Test*.*' - , 'android/**/*.*', "io/realm/*.*"] - def debugTree = fileTree(dir: "${buildDir}/intermediates/javac/debug/classes", excludes: fileFilter) - def mainSrc = "${project.projectDir}/src/main/java" - - sourceDirectories.setFrom(files([mainSrc])) - classDirectories.setFrom(files([debugTree])) - executionData.setFrom(fileTree(dir: project.buildDir, includes: [ - 'jacoco/testDebugUnitTest.exec', 'outputs/code-coverage/connected/*coverage.ec' - ])) -} \ No newline at end of file diff --git a/wrapper/proguard-rules.pro b/wrapper/proguard-rules.pro deleted file mode 100644 index f0b73f552..000000000 --- a/wrapper/proguard-rules.pro +++ /dev/null @@ -1,25 +0,0 @@ -# Add project specific ProGuard rules here. -# By default, the flags in this file are appended to flags specified -# in /opt/android-sdk/tools/proguard/proguard-android.txt -# You can edit the include path and order by changing the proguardFiles -# directive in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# Add any project specific keep options here: - -# 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/wrapper/src/main/AndroidManifest.xml b/wrapper/src/main/AndroidManifest.xml deleted file mode 100644 index dee3d654d..000000000 --- a/wrapper/src/main/AndroidManifest.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/wrapper/src/main/java/io/ona/kujaku/wrapper/OfflineMapDownloderActivity.java b/wrapper/src/main/java/io/ona/kujaku/wrapper/OfflineMapDownloderActivity.java deleted file mode 100644 index 9684a11e8..000000000 --- a/wrapper/src/main/java/io/ona/kujaku/wrapper/OfflineMapDownloderActivity.java +++ /dev/null @@ -1,14 +0,0 @@ -package io.ona.kujaku.wrapper; - -import android.os.Bundle; - -import androidx.appcompat.app.AppCompatActivity; - -public class OfflineMapDownloderActivity extends AppCompatActivity { - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_offline_map_downloder); - } -} diff --git a/wrapper/src/main/res/layout/activity_offline_map_downloder.xml b/wrapper/src/main/res/layout/activity_offline_map_downloder.xml deleted file mode 100644 index c83dd0815..000000000 --- a/wrapper/src/main/res/layout/activity_offline_map_downloder.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - diff --git a/wrapper/src/main/res/mipmap-hdpi/ic_launcher.png b/wrapper/src/main/res/mipmap-hdpi/ic_launcher.png deleted file mode 100644 index cde69bccc..000000000 Binary files a/wrapper/src/main/res/mipmap-hdpi/ic_launcher.png and /dev/null differ diff --git a/wrapper/src/main/res/mipmap-hdpi/ic_launcher_round.png b/wrapper/src/main/res/mipmap-hdpi/ic_launcher_round.png deleted file mode 100644 index 9a078e3e1..000000000 Binary files a/wrapper/src/main/res/mipmap-hdpi/ic_launcher_round.png and /dev/null differ diff --git a/wrapper/src/main/res/mipmap-mdpi/ic_launcher.png b/wrapper/src/main/res/mipmap-mdpi/ic_launcher.png deleted file mode 100644 index c133a0cbd..000000000 Binary files a/wrapper/src/main/res/mipmap-mdpi/ic_launcher.png and /dev/null differ diff --git a/wrapper/src/main/res/mipmap-mdpi/ic_launcher_round.png b/wrapper/src/main/res/mipmap-mdpi/ic_launcher_round.png deleted file mode 100644 index efc028a63..000000000 Binary files a/wrapper/src/main/res/mipmap-mdpi/ic_launcher_round.png and /dev/null differ diff --git a/wrapper/src/main/res/mipmap-xhdpi/ic_launcher.png b/wrapper/src/main/res/mipmap-xhdpi/ic_launcher.png deleted file mode 100644 index bfa42f0e7..000000000 Binary files a/wrapper/src/main/res/mipmap-xhdpi/ic_launcher.png and /dev/null differ diff --git a/wrapper/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/wrapper/src/main/res/mipmap-xhdpi/ic_launcher_round.png deleted file mode 100644 index 3af2608a4..000000000 Binary files a/wrapper/src/main/res/mipmap-xhdpi/ic_launcher_round.png and /dev/null differ diff --git a/wrapper/src/main/res/mipmap-xxhdpi/ic_launcher.png b/wrapper/src/main/res/mipmap-xxhdpi/ic_launcher.png deleted file mode 100644 index 324e72cdd..000000000 Binary files a/wrapper/src/main/res/mipmap-xxhdpi/ic_launcher.png and /dev/null differ diff --git a/wrapper/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/wrapper/src/main/res/mipmap-xxhdpi/ic_launcher_round.png deleted file mode 100644 index 9bec2e623..000000000 Binary files a/wrapper/src/main/res/mipmap-xxhdpi/ic_launcher_round.png and /dev/null differ diff --git a/wrapper/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/wrapper/src/main/res/mipmap-xxxhdpi/ic_launcher.png deleted file mode 100644 index aee44e138..000000000 Binary files a/wrapper/src/main/res/mipmap-xxxhdpi/ic_launcher.png and /dev/null differ diff --git a/wrapper/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/wrapper/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png deleted file mode 100644 index 34947cd6b..000000000 Binary files a/wrapper/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png and /dev/null differ diff --git a/wrapper/src/main/res/values/colors.xml b/wrapper/src/main/res/values/colors.xml deleted file mode 100644 index 3ab3e9cbc..000000000 --- a/wrapper/src/main/res/values/colors.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - #3F51B5 - #303F9F - #FF4081 - diff --git a/wrapper/src/main/res/values/strings.xml b/wrapper/src/main/res/values/strings.xml deleted file mode 100644 index 388364a14..000000000 --- a/wrapper/src/main/res/values/strings.xml +++ /dev/null @@ -1,3 +0,0 @@ - - Kujaku - diff --git a/wrapper/src/main/res/values/styles.xml b/wrapper/src/main/res/values/styles.xml deleted file mode 100644 index 5885930df..000000000 --- a/wrapper/src/main/res/values/styles.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - diff --git a/wrapper/src/test/java/io/ona/kujaku/wrapper/ExampleUnitTest.java b/wrapper/src/test/java/io/ona/kujaku/wrapper/ExampleUnitTest.java deleted file mode 100644 index 3956c0603..000000000 --- a/wrapper/src/test/java/io/ona/kujaku/wrapper/ExampleUnitTest.java +++ /dev/null @@ -1,17 +0,0 @@ -package io.ona.kujaku.wrapper; - -import org.junit.Test; - -import static org.junit.Assert.*; - -/** - * Example local unit test, which will execute on the development machine (host). - * - * @see Testing documentation - */ -public class ExampleUnitTest { - @Test - public void addition_isCorrect() throws Exception { - assertEquals(4, 2 + 2); - } -} \ No newline at end of file