From 6802487a05b12f3435dc9d49b75916eac92ed1a4 Mon Sep 17 00:00:00 2001
From: Kristen Halper <khalper@microsoft.com>
Date: Thu, 4 May 2023 11:01:53 -0700
Subject: [PATCH] Update WindowState dependencies (#57)

* Update WindowState gradle and dependencies

* Update readme

* Update JDK version for workflow
---
 .github/workflows/build_test_check.yml        |  4 ++--
 WindowState/README.md                         |  2 +-
 WindowState/dependencies.gradle               | 24 +++++++++----------
 WindowState/gradle.properties                 |  4 +++-
 .../gradle/wrapper/gradle-wrapper.properties  |  2 +-
 5 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/build_test_check.yml b/.github/workflows/build_test_check.yml
index 2529dd8..cb04612 100644
--- a/.github/workflows/build_test_check.yml
+++ b/.github/workflows/build_test_check.yml
@@ -27,10 +27,10 @@ jobs:
     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: Cache gradle packages
         uses: actions/cache@v2
diff --git a/WindowState/README.md b/WindowState/README.md
index 103ac5c..522c452 100644
--- a/WindowState/README.md
+++ b/WindowState/README.md
@@ -24,7 +24,7 @@ And the window size classes are measured based on Google's [Window size classes]
 2. Add dependencies to the module-level **build.gradle** file (current version may be different from what's shown here).
 
     ```gradle
-    implementation "com.microsoft.device.dualscreen:windowstate:1.0.0-alpha08"
+    implementation "com.microsoft.device.dualscreen:windowstate:1.0.0-alpha09"
     ```
 
 3. Also ensure the compileSdkVersion is set to API 33 and the targetSdkVersion is set to API 32 or newer in the module-level build.gradle file.
diff --git a/WindowState/dependencies.gradle b/WindowState/dependencies.gradle
index 661d2fe..c289de4 100644
--- a/WindowState/dependencies.gradle
+++ b/WindowState/dependencies.gradle
@@ -14,16 +14,16 @@ ext {
 
     // WindowState library version code:
     // If you want to publish a new version, bump in one (1) the specific line(s)
-    windowStateVersionCode = 8
+    windowStateVersionCode = 9
 
     // WindowState library version name:
     // If you want to publish a new version, bump the specific line
-    windowStateVersionName = '1.0.0-alpha08'
+    windowStateVersionName = '1.0.0-alpha09'
 
     // ----------------------------------
 
-    gradlePluginVersion = '7.3.0'
-    kotlinVersion = '1.8.0'
+    gradlePluginVersion = '8.0.0'
+    kotlinVersion = '1.8.21'
     compileSdkVersion = 33
     targetSdkVersion = 32
     minSdkVersion = 23
@@ -44,9 +44,9 @@ ext {
     ]
 
     // AndroidX dependencies
-    appCompatVersion = '1.6.0'
-    ktxCoreVersion = '1.9.0'
-    windowVersion = "1.1.0-alpha04"
+    appCompatVersion = '1.6.1'
+    ktxCoreVersion = '1.10.0'
+    windowVersion = "1.1.0-beta02"
     androidxDependencies = [
             appCompat         : "androidx.appcompat:appcompat:$appCompatVersion",
             ktxCore           : "androidx.core:core-ktx:$ktxCoreVersion",
@@ -55,10 +55,10 @@ ext {
     ]
 
     // Compose dependencies
-    composeVersion = '1.3.3'
-    composeMaterialVersion = '1.3.1'
-    composeCompilerVersion = "1.4.0"
-    activityComposeVersion = '1.6.1'
+    composeVersion = '1.4.3'
+    composeMaterialVersion = '1.4.3'
+    composeCompilerVersion = "1.4.7"
+    activityComposeVersion = '1.7.1'
     navigationComposeVersion = "2.5.3"
     composeDependencies = [
             composeMaterial         : "androidx.compose.material:material:$composeMaterialVersion",
@@ -74,7 +74,7 @@ ext {
     androidxTestRunnerVersion = '1.5.2'
     espressoVersion = '3.5.1'
     junitVersion = '4.13.2'
-    mockitoVersion = '5.1.1'
+    mockitoVersion = '5.3.1'
     uiAutomatorVersion = "2.2.0"
     testDependencies = [
             androidxTestCore        : "androidx.test:core:$androidxTestVersion",
diff --git a/WindowState/gradle.properties b/WindowState/gradle.properties
index d82cb63..8145fa7 100644
--- a/WindowState/gradle.properties
+++ b/WindowState/gradle.properties
@@ -19,4 +19,6 @@ android.useAndroidX=true
 android.enableJetifier=true
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
-android.disableAutomaticComponentCreation=true
\ No newline at end of file
+android.defaults.buildfeatures.buildconfig=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false
\ No newline at end of file
diff --git a/WindowState/gradle/wrapper/gradle-wrapper.properties b/WindowState/gradle/wrapper/gradle-wrapper.properties
index 6ba004f..2e175b9 100644
--- a/WindowState/gradle/wrapper/gradle-wrapper.properties
+++ b/WindowState/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Wed Jan 05 12:49:04 PST 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME