From 8d0602e83a5dbf54def17382f51ee21adf8672e4 Mon Sep 17 00:00:00 2001 From: Cyberarm Date: Thu, 16 Nov 2023 18:09:14 -0600 Subject: [PATCH] WIP: Updating build to be buildable in new Android Studio env --- .idea/.name | 1 + .idea/compiler.xml | 2 +- .idea/gradle.xml | 3 +- .idea/jarRepositories.xml | 5 + .idea/misc.xml | 11 +- app/build.gradle | 43 ----- app/build.gradle.kts | 73 ++++++++ .../ExampleInstrumentedTest.java | 26 --- .../ExampleInstrumentedTest.kt | 24 +++ app/src/main/AndroidManifest.xml | 6 +- app/src/main/ic_launcher-playstore.png | Bin 35837 -> 0 bytes .../LauncherActivity.java | 1 - .../MainActivity.java | 3 +- .../dialogs/VariableDialog.java | 48 +++-- .../ui/editor/ActionsFragment.java | 71 ++++---- .../ui/editor/GroupsFragment.java | 63 +++---- .../res/drawable/ic_launcher_background.xml | 170 ++++++++++++++++++ .../res/drawable/ic_launcher_foreground.xml | 30 ++++ app/src/main/res/layout/activity_main.xml | 2 +- app/src/main/res/mipmap-mdpi/ic_launcher.png | Bin 1701 -> 0 bytes .../mipmap-mdpi/ic_launcher_foreground.png | Bin 2199 -> 0 bytes .../res/mipmap-mdpi/ic_launcher_round.png | Bin 2556 -> 0 bytes app/src/main/res/values/themes.xml | 5 + app/src/main/res/xml/backup_rules.xml | 13 ++ .../main/res/xml/data_extraction_rules.xml | 19 ++ .../ExampleUnitTest.java | 17 -- .../ExampleUnitTest.kt | 17 ++ build.gradle | 24 --- build.gradle.kts | 5 + gradle.properties | 23 ++- gradle/wrapper/gradle-wrapper.jar | Bin 54329 -> 59203 bytes gradle/wrapper/gradle-wrapper.properties | 4 +- gradlew | 53 +++--- gradlew.bat | 43 +++-- settings.gradle | 2 - settings.gradle.kts | 17 ++ 36 files changed, 558 insertions(+), 266 deletions(-) create mode 100644 .idea/.name delete mode 100644 app/build.gradle create mode 100644 app/build.gradle.kts delete mode 100644 app/src/androidTest/java/org/timecrafters/TimeCraftersConfigurationTool/ExampleInstrumentedTest.java create mode 100644 app/src/androidTest/java/org/timecrafters/timecraftersconfigurationtool/ExampleInstrumentedTest.kt delete mode 100644 app/src/main/ic_launcher-playstore.png create mode 100644 app/src/main/res/drawable/ic_launcher_background.xml create mode 100644 app/src/main/res/drawable/ic_launcher_foreground.xml delete mode 100644 app/src/main/res/mipmap-mdpi/ic_launcher.png delete mode 100644 app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png delete mode 100644 app/src/main/res/mipmap-mdpi/ic_launcher_round.png create mode 100644 app/src/main/res/values/themes.xml create mode 100644 app/src/main/res/xml/backup_rules.xml create mode 100644 app/src/main/res/xml/data_extraction_rules.xml delete mode 100644 app/src/test/java/org/timecrafters/TimeCraftersConfigurationTool/ExampleUnitTest.java create mode 100644 app/src/test/java/org/timecrafters/timecraftersconfigurationtool/ExampleUnitTest.kt delete mode 100644 build.gradle create mode 100644 build.gradle.kts delete mode 100644 settings.gradle create mode 100644 settings.gradle.kts diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..ed007e2 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +TimeCraftersConfigurationTool \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml index fb7f4a8..b589d56 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 2c7e034..ae388c2 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -7,14 +7,13 @@ - diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml index a5f05cd..e34606c 100644 --- a/.idea/jarRepositories.xml +++ b/.idea/jarRepositories.xml @@ -21,5 +21,10 @@