Merge pull request #104 from Carifio24/updates

Update dependencies
Carifio24 · Oct 6, 2024 · 191756f · 191756f
2 parents dad60df + abf218c
commit 191756f
Show file tree

Hide file tree

Showing 14 changed files with 89 additions and 91 deletions.
diff --git a/.github/workflows/v3.yml → .github/workflows/v4.yml b/.github/workflows/v3.yml → .github/workflows/v4.yml
@@ -1,4 +1,4 @@
-name: Version 3 CI
+name: Version 4 CI
 
 on:
   push:
@@ -8,15 +8,15 @@ on:
 
 jobs:
   build:
-
+    name: Build and Test
     runs-on: ubuntu-latest
 
     steps:
     - uses: actions/checkout@v3
-    - name: set up JDK 11
+    - name: set up JDK 17 
       uses: actions/setup-java@v3
       with:
-        java-version: '11'
+        java-version: '17'
         distribution: 'temurin'
         cache: gradle
 

diff --git a/app/build.gradle b/app/build.gradle
@@ -21,8 +21,8 @@ android {
         signingConfig signingConfigs.release
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
     buildTypes {
         release {
@@ -38,6 +38,7 @@ android {
     buildFeatures {
         viewBinding true
         dataBinding true
+        buildConfig true
     }
     testOptions {
         unitTests {
@@ -51,26 +52,27 @@ android {
 }
 
 dependencies {
-    implementation 'androidx.navigation:navigation-runtime:2.5.2'
+    implementation 'androidx.navigation:navigation-runtime:2.8.1'
     constraints {
         implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.0") {
             because 'align all versions of Kotlin transitive dependencies'
         }
     }
-    def nav_version = "2.6.0"
+    def lifecycle_version = "2.8.6"
+    def nav_version = "2.8.1"
 
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation 'androidx.core:core:1.10.1'
-    implementation 'androidx.appcompat:appcompat:1.6.1'
-    implementation 'androidx.fragment:fragment:1.6.1'
-    implementation 'androidx.lifecycle:lifecycle-livedata:2.6.2'
+    implementation 'androidx.core:core:1.13.1'
+    implementation 'androidx.appcompat:appcompat:1.7.0'
+    implementation 'androidx.fragment:fragment:1.8.4'
+    implementation "androidx.lifecycle:lifecycle-viewmodel-android:$lifecycle_version"
+    implementation "androidx.lifecycle:lifecycle-livedata:$lifecycle_version"
     implementation "androidx.navigation:navigation-fragment:$nav_version"
     implementation "androidx.navigation:navigation-ui:$nav_version"
 
-    //implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation 'androidx.preference:preference:1.2.1'
-    implementation 'com.google.android.material:material:1.9.0'
+    implementation 'com.google.android.material:material:1.12.0'
     implementation "androidx.gridlayout:gridlayout:1.0.0"
     implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0"
     implementation 'com.github.deano2390:MaterialShowcaseView:1.3.4'
@@ -84,14 +86,12 @@ dependencies {
     implementation 'com.leinardi.android:speed-dial:3.3.0'
     //implementation 'org.sufficientlysecure:html-textview:4.0'
 
-    testImplementation 'junit:junit:4.13.1'
-    testImplementation 'androidx.test:core:1.5.0'
+    testImplementation 'junit:junit:4.13.2'
+    testImplementation 'androidx.test:core:1.6.1'
     testImplementation 'com.google.truth:truth:1.1.2'
-    testImplementation 'org.robolectric:robolectric:4.4'
+    testImplementation 'org.robolectric:robolectric:4.11'
     testImplementation 'org.json:json:20180813'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
+    androidTestImplementation 'androidx.test.ext:junit:1.2.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
     implementation files('libs/commons-lang3-3.8.jar')
-}
-
-
+}
diff --git a/app/src/androidTest/java/dnd/jon/spellbook/ExampleInstrumentedTest.java b/app/src/androidTest/java/dnd/jon/spellbook/ExampleInstrumentedTest.java
@@ -19,7 +19,7 @@ public class ExampleInstrumentedTest {
     @Test
     public void useAppContext() {
         // Context of the app under test.
-        Context appContext = InstrumentationRegistry.getTargetContext();
+        Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
 
         assertEquals("dnd.jon.spellbook", appContext.getPackageName());
     }

diff --git a/app/src/main/java/dnd/jon/spellbook/HomebrewInformationDialog.java b/app/src/main/java/dnd/jon/spellbook/HomebrewInformationDialog.java
@@ -21,9 +21,7 @@ public Dialog onCreateDialog(Bundle savedInstanceState) {
 
         final AlertDialog.Builder builder = new AlertDialog.Builder(activity);
         builder.setView(binding.getRoot());
-        binding.closeHomebrewInfo.setOnClickListener((v) -> {
-            this.dismiss();
-        });
+        binding.closeHomebrewInfo.setOnClickListener((v) -> this.dismiss());
         return builder.create();
     }
 

diff --git a/app/src/main/java/dnd/jon/spellbook/SpellbookViewModelFactory.java b/app/src/main/java/dnd/jon/spellbook/SpellbookViewModelFactory.java
@@ -2,13 +2,10 @@
 
 import android.app.Application;
 
-import androidx.annotation.Keep;
 import androidx.annotation.NonNull;
 import androidx.lifecycle.ViewModel;
 import androidx.lifecycle.ViewModelProvider;
 
-import java.lang.reflect.InvocationTargetException;
-
 public class SpellbookViewModelFactory implements ViewModelProvider.Factory {
 
     private final Application application;

diff --git a/app/src/test/java/dnd/jon/spellbook/CastingTimeTest.java b/app/src/test/java/dnd/jon/spellbook/CastingTimeTest.java
@@ -23,7 +23,7 @@ public void setup() {
     }
 
     @Test
-    @Config(sdk = 28)
+    @Config(sdk = 34)
     public void CastingTimeActionParseTest() {
         final String castingTimeString = "1 action";
         final CastingTime castingTime = DisplayUtils.castingTimeFromString(context, castingTimeString);
@@ -32,7 +32,7 @@ public void CastingTimeActionParseTest() {
     }
 
     @Test
-    @Config(sdk = 28)
+    @Config(sdk = 34)
     public void CastingTimeBonusActionParseTest() {
         final String castingTimeString = "1 bonus action";
         final CastingTime castingTime = DisplayUtils.castingTimeFromString(context, castingTimeString);
@@ -41,7 +41,7 @@ public void CastingTimeBonusActionParseTest() {
     }
 
     @Test
-    @Config(sdk = 28)
+    @Config(sdk = 34)
     public void CastingTimeReactionParseTest() {
         final String castingTimeString = "1 reaction";
         final CastingTime castingTime = DisplayUtils.castingTimeFromString(context, castingTimeString);
@@ -50,7 +50,7 @@ public void CastingTimeReactionParseTest() {
     }
 
     @Test
-    @Config(sdk = 28)
+    @Config(sdk = 34)
     public void CastingTimeSpanningParseTest() {
         final String castingTimeString = "10 seconds";
         final CastingTime castingTime = DisplayUtils.castingTimeFromString(context, castingTimeString);
@@ -59,7 +59,7 @@ public void CastingTimeSpanningParseTest() {
     }
 
     @Test
-    @Config(sdk = 28)
+    @Config(sdk = 34)
     public void CastingTimeSpanningParseTest2() {
         final String castingTimeString = "25 minutes";
         final CastingTime castingTime = DisplayUtils.castingTimeFromString(context, castingTimeString);
@@ -68,7 +68,7 @@ public void CastingTimeSpanningParseTest2() {
     }
 
     @Test
-    @Config(sdk = 28)
+    @Config(sdk = 34)
     public void CastingTimeSpanningParseTest3() {
         final String castingTimeString = "1 round";
         final CastingTime castingTime = DisplayUtils.castingTimeFromString(context, castingTimeString);
@@ -77,7 +77,7 @@ public void CastingTimeSpanningParseTest3() {
     }
 
     @Test
-    @Config(sdk = 28)
+    @Config(sdk = 34)
     public void CastingTimeSpanningParseTest4() {
         final String castingTimeString = "2 years";
         final CastingTime castingTime = DisplayUtils.castingTimeFromString(context, castingTimeString);
@@ -86,7 +86,7 @@ public void CastingTimeSpanningParseTest4() {
     }
 
     @Test
-    @Config(sdk = 28)
+    @Config(sdk = 34)
     public void CastingTimeSpanningParseTest5() {
         final String castingTimeString = "1 day";
         final CastingTime castingTime = DisplayUtils.castingTimeFromString(context, castingTimeString);
@@ -95,7 +95,7 @@ public void CastingTimeSpanningParseTest5() {
     }
 
     @Test
-    @Config(sdk = 28)
+    @Config(sdk = 34)
     public void CastingTimeSpanningParseTest6() {
         final String castingTimeString = "4 hours";
         final CastingTime castingTime = DisplayUtils.castingTimeFromString(context, castingTimeString);
@@ -105,7 +105,7 @@ public void CastingTimeSpanningParseTest6() {
 
 
     @Test
-    @Config(sdk = 28)
+    @Config(sdk = 34)
     public void CastingTimeActionParse2024Test() {
         final String castingTimeString = "Action";
         final CastingTime castingTime = DisplayUtils.castingTimeFromString(context, castingTimeString);
@@ -114,7 +114,7 @@ public void CastingTimeActionParse2024Test() {
     }
 
     @Test
-    @Config(sdk = 28)
+    @Config(sdk = 34)
     public void CastingTimeBonusActionParse2024Test() {
         final String castingTimeString = "Bonus action";
         final CastingTime castingTime = DisplayUtils.castingTimeFromString(context, castingTimeString);
@@ -123,7 +123,7 @@ public void CastingTimeBonusActionParse2024Test() {
     }
 
     @Test
-    @Config(sdk = 28)
+    @Config(sdk = 34)
     public void CastingTimeReactionParse2024Test() {
         final String castingTimeString = "Reaction";
         final CastingTime castingTime = DisplayUtils.castingTimeFromString(context, castingTimeString);