Bump androidx.lifecycle:lifecycle-viewmodel-ktx from 2.5.1 to 2.6.2 i…

…n /10-bitClockWidget (#129)
ashutoshgngwr · Oct 1, 2023 · ade3746 · ade3746
1 parent 6953924
commit ade3746
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 27 deletions.
diff --git a/10-bitClockWidget/app/build.gradle b/10-bitClockWidget/app/build.gradle
@@ -14,20 +14,22 @@
  *     You should have received a copy of the GNU General Public License
  *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
-apply plugin: 'com.android.application'
+plugins {
+  id 'com.android.application'
+}
 
 android {
-  compileSdkVersion 33
+  compileSdk 33
 
   defaultConfig {
     namespace "com.github.ashutoshgngwr.tenbitclockwidget"
     applicationId "com.github.ashutoshgngwr.tenbitclockwidget"
-    minSdkVersion 14
-    targetSdkVersion 33
+    minSdk 14
+    targetSdk 33
     versionCode 214
     versionName "2.1-4"
   }
+
   buildTypes {
     release {
       debuggable false
@@ -46,8 +48,6 @@ android {
 }
 
 dependencies {
-  // https://issuetracker.google.com/issues/238425626
-  api 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1'
   implementation 'androidx.appcompat:appcompat:1.6.1'
   implementation 'androidx.preference:preference:1.2.1'
   implementation('com.github.GrenderG:Color-O-Matic:1.1.5') {

diff --git a/10-bitClockWidget/build.gradle b/10-bitClockWidget/build.gradle
@@ -14,26 +14,10 @@
  *     You should have received a copy of the GNU General Public License
  *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
-buildscript {
-    repositories {
-        google()
-        mavenCentral()
-    }
-
-    dependencies {
-        classpath 'com.android.tools.build:gradle:8.1.1'
-    }
-}
-
-allprojects {
-    repositories {
-        google()
-        mavenCentral()
-        maven { url "https://jitpack.io" }
-    }
+plugins {
+  id 'com.android.application' version "8.1.2" apply false
 }
 
-task clean(type: Delete) {
-    delete rootProject.buildDir
+tasks.register('clean', Delete) {
+  delete rootProject.layout.buildDir
 }
diff --git a/10-bitClockWidget/gradle.properties b/10-bitClockWidget/gradle.properties
@@ -29,3 +29,6 @@
 org.gradle.jvmargs=-Xmx1536m
 android.enableJetifier=true
 android.useAndroidX=true
+android.defaults.buildfeatures.buildconfig=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false
diff --git a/10-bitClockWidget/settings.gradle b/10-bitClockWidget/settings.gradle
@@ -14,5 +14,22 @@
  *     You should have received a copy of the GNU General Public License
  *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+pluginManagement {
+  repositories {
+    gradlePluginPortal()
+    google()
+    mavenCentral()
+  }
+}
 
+dependencyResolutionManagement {
+  repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
+  repositories {
+    google()
+    mavenCentral()
+    maven { url "https://jitpack.io" }
+  }
+}
+
+rootProject.name = '10-bit Clock Widget'
 include ':app'