From 988e81140815d950a1d713686b6c1dd47deb28ee Mon Sep 17 00:00:00 2001 From: Abhishek Saxena <5abhisheksaxena@gmail.com> Date: Sat, 27 Jan 2024 15:07:29 +0530 Subject: [PATCH 1/4] Updating AGP to 7.4.2. --- .idea/compiler.xml | 2 +- .idea/gradle.xml | 4 ++-- .idea/misc.xml | 3 +-- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- 5 files changed, 6 insertions(+), 7 deletions(-) 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 a2d7c21..0897082 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -4,15 +4,15 @@ diff --git a/.idea/misc.xml b/.idea/misc.xml index b66daf4..15226b5 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,4 +1,3 @@ - - + diff --git a/build.gradle b/build.gradle index 897b8b4..9b320c2 100644 --- a/build.gradle +++ b/build.gradle @@ -15,7 +15,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.3.1' + classpath 'com.android.tools.build:gradle:7.4.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.20" classpath 'com.google.dagger:hilt-android-gradle-plugin:2.43.2' classpath "org.jlleitschuh.gradle:ktlint-gradle:$ktlintPluginVersion" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 72c9a5e..0444fe2 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Mon Sep 05 03:22:29 IST 2022 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME From 33c23a9993afd1fb1d78f17cb5b64b53368f5f94 Mon Sep 17 00:00:00 2001 From: Abhishek Saxena <5abhisheksaxena@gmail.com> Date: Sat, 27 Jan 2024 15:17:57 +0530 Subject: [PATCH 2/4] Updating AGP to 8.2. --- app/build.gradle | 4 ++-- build.gradle | 2 +- gradle.properties | 7 ++++--- gradle/wrapper/gradle-wrapper.properties | 2 +- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 8a7f509..7d8d9b5 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -12,7 +12,7 @@ keystoreProperties.load(new FileInputStream(keystorePropertiesFile)) android { namespace 'com.abhishek.germanPocketDictionary' - compileSdkVersion 33 + compileSdk 34 signingConfigs { release { @@ -26,7 +26,7 @@ android { defaultConfig { applicationId "com.abhishek.germanPocketDictionary" minSdk 21 - targetSdkVersion 32 + targetSdkVersion 34 versionCode 15 versionName '2.0.2' testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" diff --git a/build.gradle b/build.gradle index 9b320c2..5109fec 100644 --- a/build.gradle +++ b/build.gradle @@ -15,7 +15,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.4.2' + classpath 'com.android.tools.build:gradle:8.2.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.20" classpath 'com.google.dagger:hilt-android-gradle-plugin:2.43.2' classpath "org.jlleitschuh.gradle:ktlint-gradle:$ktlintPluginVersion" diff --git a/gradle.properties b/gradle.properties index 8daead6..5b8ad3b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -12,10 +12,11 @@ android.enableJetifier=true android.useAndroidX=true org.gradle.jvmargs=-Xmx1536m - # When configured, Gradle will run in incubating parallel mode. # This option should only be used with decoupled projects. More details, visit # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects # org.gradle.parallel=true - -applicationName=German Pocket Dictionary \ No newline at end of file +applicationName=German Pocket Dictionary +android.defaults.buildfeatures.buildconfig=true +android.nonTransitiveRClass=false +android.nonFinalResIds=false \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 0444fe2..8139e45 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Mon Sep 05 03:22:29 IST 2022 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME From 2c48eb853fe2fad0dd6c63408a735fac02c669ae Mon Sep 17 00:00:00 2001 From: Abhishek Saxena <5abhisheksaxena@gmail.com> Date: Sun, 28 Jan 2024 02:26:21 +0530 Subject: [PATCH 3/4] Adding missing tab for numbers. --- .../home/ui/components/WordsPagerWithTabs.kt | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/com/abhishek/germanPocketDictionary/home/ui/components/WordsPagerWithTabs.kt b/app/src/main/java/com/abhishek/germanPocketDictionary/home/ui/components/WordsPagerWithTabs.kt index f705264..c58b698 100644 --- a/app/src/main/java/com/abhishek/germanPocketDictionary/home/ui/components/WordsPagerWithTabs.kt +++ b/app/src/main/java/com/abhishek/germanPocketDictionary/home/ui/components/WordsPagerWithTabs.kt @@ -46,17 +46,9 @@ fun WordsPagerWithTabs( val coroutineScope = rememberCoroutineScope() val pages by remember { - val wordTypes = arrayOf( - WordType.ALL_WORDS, - WordType.NOUNS, - WordType.VERBS, - WordType.COLORS, - WordType.QUESTIONS, - WordType.OPPOSITE, - ) - - mutableStateOf(wordTypes) + mutableStateOf(WordType.values()) } + LaunchedEffect(key1 = pagerState) { snapshotFlow { pagerState.currentPage }.collect { page -> onPageChange(pages[page]) From 2f0a1cefc0ab47fb60dcc35a7c7d4e8fdff609a6 Mon Sep 17 00:00:00 2001 From: Abhishek Saxena <5abhisheksaxena@gmail.com> Date: Sun, 28 Jan 2024 02:32:24 +0530 Subject: [PATCH 4/4] Updating GPD version -v2.1.0. Changes - Updated AGP to 8.2. - Added 'Numbers' tab. --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 7d8d9b5..1ed0e22 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -27,8 +27,8 @@ android { applicationId "com.abhishek.germanPocketDictionary" minSdk 21 targetSdkVersion 34 - versionCode 15 - versionName '2.0.2' + versionCode 16 + versionName '2.1.0' testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" //Defining Log debugging