From 27d415a8d24c8e022d7eff7e5944cf75ed4e0e59 Mon Sep 17 00:00:00 2001 From: Page Asgardius Date: Sat, 10 Aug 2024 11:04:40 -0700 Subject: [PATCH] test release --- .idea/deploymentTargetSelector.xml | 10 + .idea/gradle.xml | 22 +- .idea/migrations.xml | 11 + .idea/other.xml | 252 ++++++++++++++++++ .idea/vcs.xml | 1 + app/build.gradle | 12 +- .../ExampleInstrumentedTest.java | 2 +- .../{s3music => s3musicmk2}/AccountAdd.java | 2 +- .../page/{s3music => s3musicmk2}/Adapter.java | 2 +- .../{s3music => s3musicmk2}/BucketSelect.java | 2 +- .../{s3music => s3musicmk2}/MainActivity.java | 2 +- .../{s3music => s3musicmk2}/MyDbHelper.java | 2 +- .../{s3music => s3musicmk2}/ObjectSelect.java | 4 +- .../{s3music => s3musicmk2}/PolicyCheck.java | 2 +- .../RecyclerTouchListener.java | 2 +- .../{s3music => s3musicmk2}/SdcardCheck.java | 2 +- .../{s3music => s3musicmk2}/Settings.java | 4 +- .../{s3music => s3musicmk2}/VideoPlayer.java | 2 +- .../{s3music => s3musicmk2}/WebBrowser.java | 2 +- .../{s3music => s3musicmk2}/list_item.java | 2 +- .../ExampleUnitTest.java | 2 +- build.gradle | 4 +- gradle/wrapper/gradle-wrapper.properties | 2 +- 23 files changed, 315 insertions(+), 33 deletions(-) create mode 100644 .idea/deploymentTargetSelector.xml create mode 100644 .idea/migrations.xml create mode 100644 .idea/other.xml rename app/src/androidTest/java/asgardius/page/{s3music => s3musicmk2}/ExampleInstrumentedTest.java (95%) rename app/src/main/java/asgardius/page/{s3music => s3musicmk2}/AccountAdd.java (99%) rename app/src/main/java/asgardius/page/{s3music => s3musicmk2}/Adapter.java (97%) rename app/src/main/java/asgardius/page/{s3music => s3musicmk2}/BucketSelect.java (99%) rename app/src/main/java/asgardius/page/{s3music => s3musicmk2}/MainActivity.java (99%) rename app/src/main/java/asgardius/page/{s3music => s3musicmk2}/MyDbHelper.java (98%) rename app/src/main/java/asgardius/page/{s3music => s3musicmk2}/ObjectSelect.java (99%) rename app/src/main/java/asgardius/page/{s3music => s3musicmk2}/PolicyCheck.java (98%) rename app/src/main/java/asgardius/page/{s3music => s3musicmk2}/RecyclerTouchListener.java (98%) rename app/src/main/java/asgardius/page/{s3music => s3musicmk2}/SdcardCheck.java (95%) rename app/src/main/java/asgardius/page/{s3music => s3musicmk2}/Settings.java (98%) rename app/src/main/java/asgardius/page/{s3music => s3musicmk2}/VideoPlayer.java (99%) rename app/src/main/java/asgardius/page/{s3music => s3musicmk2}/WebBrowser.java (97%) rename app/src/main/java/asgardius/page/{s3music => s3musicmk2}/list_item.java (89%) rename app/src/test/java/asgardius/page/{s3music => s3musicmk2}/ExampleUnitTest.java (90%) diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml new file mode 100644 index 0000000..b268ef3 --- /dev/null +++ b/.idea/deploymentTargetSelector.xml @@ -0,0 +1,10 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 56d6814..87bfdd1 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -4,16 +4,26 @@ diff --git a/.idea/migrations.xml b/.idea/migrations.xml new file mode 100644 index 0000000..35b39ca --- /dev/null +++ b/.idea/migrations.xml @@ -0,0 +1,11 @@ + + + + + + \ No newline at end of file diff --git a/.idea/other.xml b/.idea/other.xml new file mode 100644 index 0000000..4604c44 --- /dev/null +++ b/.idea/other.xml @@ -0,0 +1,252 @@ + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml index 94a25f7..492acab 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -1,6 +1,7 @@ + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index b2f8e40..30ff9bf 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -6,11 +6,11 @@ android { compileSdk 33 defaultConfig { - applicationId "asgardius.page.s3music" + applicationId "asgardius.page.s3musicmk2" minSdk 21 - targetSdk 33 - versionCode 12 - versionName "0.2.1" + targetSdk 34 + versionCode 1 + versionName "0.3.0" setProperty("archivesBaseName", "s3-music-$versionName") testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" @@ -29,7 +29,7 @@ android { buildFeatures { viewBinding true } - namespace 'asgardius.page.s3music' + namespace 'asgardius.page.s3musicmk2' } dependencies { @@ -43,7 +43,7 @@ dependencies { implementation 'androidx.recyclerview:recyclerview:1.2.1' implementation"com.otaliastudios:zoomlayout:1.9.0" // BEGIN AWS DEPENDENCIES - def aws_version = "2.73.0" + def aws_version = "2.76.0" implementation "com.amazonaws:aws-android-sdk-s3:$aws_version" implementation ("com.amazonaws:aws-android-sdk-mobile-client:$aws_version") { transitive = true } // END AWS DEPENDENCIES diff --git a/app/src/androidTest/java/asgardius/page/s3music/ExampleInstrumentedTest.java b/app/src/androidTest/java/asgardius/page/s3musicmk2/ExampleInstrumentedTest.java similarity index 95% rename from app/src/androidTest/java/asgardius/page/s3music/ExampleInstrumentedTest.java rename to app/src/androidTest/java/asgardius/page/s3musicmk2/ExampleInstrumentedTest.java index 35154b7..e87ba70 100644 --- a/app/src/androidTest/java/asgardius/page/s3music/ExampleInstrumentedTest.java +++ b/app/src/androidTest/java/asgardius/page/s3musicmk2/ExampleInstrumentedTest.java @@ -1,4 +1,4 @@ -package asgardius.page.s3music; +package asgardius.page.s3musicmk2; import android.content.Context; diff --git a/app/src/main/java/asgardius/page/s3music/AccountAdd.java b/app/src/main/java/asgardius/page/s3musicmk2/AccountAdd.java similarity index 99% rename from app/src/main/java/asgardius/page/s3music/AccountAdd.java rename to app/src/main/java/asgardius/page/s3musicmk2/AccountAdd.java index a5b66db..9badd5b 100644 --- a/app/src/main/java/asgardius/page/s3music/AccountAdd.java +++ b/app/src/main/java/asgardius/page/s3musicmk2/AccountAdd.java @@ -1,4 +1,4 @@ -package asgardius.page.s3music; +package asgardius.page.s3musicmk2; import android.content.Intent; import android.database.sqlite.SQLiteDatabase; diff --git a/app/src/main/java/asgardius/page/s3music/Adapter.java b/app/src/main/java/asgardius/page/s3musicmk2/Adapter.java similarity index 97% rename from app/src/main/java/asgardius/page/s3music/Adapter.java rename to app/src/main/java/asgardius/page/s3musicmk2/Adapter.java index 3350a13..1ff0512 100644 --- a/app/src/main/java/asgardius/page/s3music/Adapter.java +++ b/app/src/main/java/asgardius/page/s3musicmk2/Adapter.java @@ -1,4 +1,4 @@ -package asgardius.page.s3music; +package asgardius.page.s3musicmk2; import android.annotation.SuppressLint; import android.content.Context; diff --git a/app/src/main/java/asgardius/page/s3music/BucketSelect.java b/app/src/main/java/asgardius/page/s3musicmk2/BucketSelect.java similarity index 99% rename from app/src/main/java/asgardius/page/s3music/BucketSelect.java rename to app/src/main/java/asgardius/page/s3musicmk2/BucketSelect.java index f883b27..0a44e8b 100644 --- a/app/src/main/java/asgardius/page/s3music/BucketSelect.java +++ b/app/src/main/java/asgardius/page/s3musicmk2/BucketSelect.java @@ -1,4 +1,4 @@ -package asgardius.page.s3music; +package asgardius.page.s3musicmk2; import android.content.Intent; import android.os.Bundle; diff --git a/app/src/main/java/asgardius/page/s3music/MainActivity.java b/app/src/main/java/asgardius/page/s3musicmk2/MainActivity.java similarity index 99% rename from app/src/main/java/asgardius/page/s3music/MainActivity.java rename to app/src/main/java/asgardius/page/s3musicmk2/MainActivity.java index e4c3a61..ac1bfdc 100644 --- a/app/src/main/java/asgardius/page/s3music/MainActivity.java +++ b/app/src/main/java/asgardius/page/s3musicmk2/MainActivity.java @@ -1,4 +1,4 @@ -package asgardius.page.s3music; +package asgardius.page.s3musicmk2; import android.content.DialogInterface; import android.content.Intent; diff --git a/app/src/main/java/asgardius/page/s3music/MyDbHelper.java b/app/src/main/java/asgardius/page/s3musicmk2/MyDbHelper.java similarity index 98% rename from app/src/main/java/asgardius/page/s3music/MyDbHelper.java rename to app/src/main/java/asgardius/page/s3musicmk2/MyDbHelper.java index c9de099..24b2cae 100644 --- a/app/src/main/java/asgardius/page/s3music/MyDbHelper.java +++ b/app/src/main/java/asgardius/page/s3musicmk2/MyDbHelper.java @@ -1,4 +1,4 @@ -package asgardius.page.s3music; +package asgardius.page.s3musicmk2; import android.content.Context; import android.database.sqlite.SQLiteDatabase; diff --git a/app/src/main/java/asgardius/page/s3music/ObjectSelect.java b/app/src/main/java/asgardius/page/s3musicmk2/ObjectSelect.java similarity index 99% rename from app/src/main/java/asgardius/page/s3music/ObjectSelect.java rename to app/src/main/java/asgardius/page/s3musicmk2/ObjectSelect.java index 41cf9b0..ba03f81 100644 --- a/app/src/main/java/asgardius/page/s3music/ObjectSelect.java +++ b/app/src/main/java/asgardius/page/s3musicmk2/ObjectSelect.java @@ -1,4 +1,4 @@ -package asgardius.page.s3music; +package asgardius.page.s3musicmk2; import android.content.Intent; import android.os.Bundle; @@ -16,13 +16,11 @@ import com.amazonaws.regions.Region; import com.amazonaws.services.s3.AmazonS3; import com.amazonaws.services.s3.AmazonS3Client; import com.amazonaws.services.s3.S3ClientOptions; -import com.amazonaws.services.s3.model.GeneratePresignedUrlRequest; import com.amazonaws.services.s3.model.ListObjectsRequest; import com.amazonaws.services.s3.model.ObjectListing; import com.amazonaws.services.s3.model.S3ObjectSummary; import java.io.BufferedReader; -import java.io.FileInputStream; import java.io.InputStreamReader; import java.net.URL; import java.util.ArrayList; diff --git a/app/src/main/java/asgardius/page/s3music/PolicyCheck.java b/app/src/main/java/asgardius/page/s3musicmk2/PolicyCheck.java similarity index 98% rename from app/src/main/java/asgardius/page/s3music/PolicyCheck.java rename to app/src/main/java/asgardius/page/s3musicmk2/PolicyCheck.java index 550bc29..9793248 100644 --- a/app/src/main/java/asgardius/page/s3music/PolicyCheck.java +++ b/app/src/main/java/asgardius/page/s3musicmk2/PolicyCheck.java @@ -1,4 +1,4 @@ -package asgardius.page.s3music; +package asgardius.page.s3musicmk2; import com.amazonaws.services.s3.AmazonS3; import com.amazonaws.services.s3.model.GeneratePresignedUrlRequest; diff --git a/app/src/main/java/asgardius/page/s3music/RecyclerTouchListener.java b/app/src/main/java/asgardius/page/s3musicmk2/RecyclerTouchListener.java similarity index 98% rename from app/src/main/java/asgardius/page/s3music/RecyclerTouchListener.java rename to app/src/main/java/asgardius/page/s3musicmk2/RecyclerTouchListener.java index 03a5d33..611934b 100644 --- a/app/src/main/java/asgardius/page/s3music/RecyclerTouchListener.java +++ b/app/src/main/java/asgardius/page/s3musicmk2/RecyclerTouchListener.java @@ -1,4 +1,4 @@ -package asgardius.page.s3music; +package asgardius.page.s3musicmk2; import android.content.Context; import android.view.GestureDetector; diff --git a/app/src/main/java/asgardius/page/s3music/SdcardCheck.java b/app/src/main/java/asgardius/page/s3musicmk2/SdcardCheck.java similarity index 95% rename from app/src/main/java/asgardius/page/s3music/SdcardCheck.java rename to app/src/main/java/asgardius/page/s3musicmk2/SdcardCheck.java index 91fd4e5..f52e69d 100644 --- a/app/src/main/java/asgardius/page/s3music/SdcardCheck.java +++ b/app/src/main/java/asgardius/page/s3musicmk2/SdcardCheck.java @@ -1,4 +1,4 @@ -package asgardius.page.s3music; +package asgardius.page.s3musicmk2; import android.content.Context; import android.content.pm.ApplicationInfo; diff --git a/app/src/main/java/asgardius/page/s3music/Settings.java b/app/src/main/java/asgardius/page/s3musicmk2/Settings.java similarity index 98% rename from app/src/main/java/asgardius/page/s3music/Settings.java rename to app/src/main/java/asgardius/page/s3musicmk2/Settings.java index 26555c6..5212762 100644 --- a/app/src/main/java/asgardius/page/s3music/Settings.java +++ b/app/src/main/java/asgardius/page/s3musicmk2/Settings.java @@ -1,4 +1,4 @@ -package asgardius.page.s3music; +package asgardius.page.s3musicmk2; import android.annotation.SuppressLint; import android.content.Intent; @@ -19,7 +19,7 @@ import com.google.android.material.switchmaterial.SwitchMaterial; import java.io.File; -import asgardius.page.s3music.databinding.ActivitySettingsBinding; +import asgardius.page.s3musicmk2.databinding.ActivitySettingsBinding; public class Settings extends AppCompatActivity { diff --git a/app/src/main/java/asgardius/page/s3music/VideoPlayer.java b/app/src/main/java/asgardius/page/s3musicmk2/VideoPlayer.java similarity index 99% rename from app/src/main/java/asgardius/page/s3music/VideoPlayer.java rename to app/src/main/java/asgardius/page/s3musicmk2/VideoPlayer.java index 9c86551..c8fbf2a 100644 --- a/app/src/main/java/asgardius/page/s3music/VideoPlayer.java +++ b/app/src/main/java/asgardius/page/s3musicmk2/VideoPlayer.java @@ -1,4 +1,4 @@ -package asgardius.page.s3music; +package asgardius.page.s3musicmk2; import android.app.NotificationChannel; import android.app.NotificationManager; diff --git a/app/src/main/java/asgardius/page/s3music/WebBrowser.java b/app/src/main/java/asgardius/page/s3musicmk2/WebBrowser.java similarity index 97% rename from app/src/main/java/asgardius/page/s3music/WebBrowser.java rename to app/src/main/java/asgardius/page/s3musicmk2/WebBrowser.java index 27963c0..525b9f5 100644 --- a/app/src/main/java/asgardius/page/s3music/WebBrowser.java +++ b/app/src/main/java/asgardius/page/s3musicmk2/WebBrowser.java @@ -1,4 +1,4 @@ -package asgardius.page.s3music; +package asgardius.page.s3musicmk2; import androidx.appcompat.app.AppCompatActivity; diff --git a/app/src/main/java/asgardius/page/s3music/list_item.java b/app/src/main/java/asgardius/page/s3musicmk2/list_item.java similarity index 89% rename from app/src/main/java/asgardius/page/s3music/list_item.java rename to app/src/main/java/asgardius/page/s3musicmk2/list_item.java index 5ab8b07..9f1172c 100644 --- a/app/src/main/java/asgardius/page/s3music/list_item.java +++ b/app/src/main/java/asgardius/page/s3musicmk2/list_item.java @@ -1,4 +1,4 @@ -package asgardius.page.s3music; +package asgardius.page.s3musicmk2; import androidx.appcompat.app.AppCompatActivity; diff --git a/app/src/test/java/asgardius/page/s3music/ExampleUnitTest.java b/app/src/test/java/asgardius/page/s3musicmk2/ExampleUnitTest.java similarity index 90% rename from app/src/test/java/asgardius/page/s3music/ExampleUnitTest.java rename to app/src/test/java/asgardius/page/s3musicmk2/ExampleUnitTest.java index 2a52ffd..d51e229 100644 --- a/app/src/test/java/asgardius/page/s3music/ExampleUnitTest.java +++ b/app/src/test/java/asgardius/page/s3musicmk2/ExampleUnitTest.java @@ -1,4 +1,4 @@ -package asgardius.page.s3music; +package asgardius.page.s3musicmk2; import org.junit.Test; diff --git a/build.gradle b/build.gradle index 5f4fc7d..033efca 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,7 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { - id 'com.android.application' version '8.1.4' apply false - id 'com.android.library' version '8.1.4' apply false + id 'com.android.application' version '8.5.1' apply false + id 'com.android.library' version '8.5.1' apply false } task clean(type: Delete) { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a78c6f8..3330a04 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Sat Aug 27 12:12:23 MST 2022 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME