Skip to content

Commit 90a4842

Browse files
author
Atiq
committed
chore: upgrade dependencies
1 parent bb906c7 commit 90a4842

File tree

11 files changed

+100
-43
lines changed

11 files changed

+100
-43
lines changed

‎app/build.gradle

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@ translation {
1414
}
1515

1616
android {
17-
compileSdkVersion 30
17+
compileSdkVersion 31
1818
buildToolsVersion "30.0.3"
1919
flavorDimensions "default"
2020

2121
defaultConfig {
2222
applicationId "com.monstarlab"
2323
minSdkVersion 23
24-
targetSdkVersion 30
24+
targetSdkVersion 31
2525
versionCode 1
2626
versionName "1.0"
2727

@@ -88,27 +88,27 @@ dependencies {
8888

8989
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:${versions.coroutines}"
9090
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:${versions.coroutines}"
91-
implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.0.1"
91+
implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:${versions.json}"
9292

93-
implementation 'androidx.core:core-ktx:1.3.2'
94-
implementation 'androidx.appcompat:appcompat:1.2.0'
95-
implementation 'com.google.android.material:material:1.3.0'
96-
implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
97-
testImplementation 'junit:junit:4.13.2'
98-
androidTestImplementation 'androidx.test.ext:junit:1.1.2'
99-
androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
93+
implementation "androidx.core:core-ktx:${versions.ktx_core}"
94+
implementation "androidx.appcompat:appcompat:${versions.appcompat}"
95+
implementation "com.google.android.material:material:${versions.material}"
96+
implementation "androidx.constraintlayout:constraintlayout:${versions.constraint_layout}"
97+
testImplementation "junit:junit:${versions.junit}"
98+
androidTestImplementation "androidx.test.ext:junit:${versions.junit_ext}"
99+
androidTestImplementation "androidx.test.espresso:espresso-core:${versions.espresso}"
100100

101101

102102
implementation "com.google.dagger:hilt-android:${versions.hilt}"
103103
kapt "com.google.dagger:hilt-compiler:${versions.hilt}"
104104

105105

106-
implementation("com.jakewharton.retrofit:retrofit2-kotlinx-serialization-converter:0.8.0")
107-
implementation("com.squareup.retrofit2:retrofit:2.9.0")
108-
implementation("com.squareup.okhttp3:logging-interceptor:4.9.0")
106+
implementation("com.jakewharton.retrofit:retrofit2-kotlinx-serialization-converter:${versions.retrofit_converter}")
107+
implementation("com.squareup.retrofit2:retrofit:${versions.retrofit}")
108+
implementation("com.squareup.okhttp3:logging-interceptor:${versions.okhttp}")
109109

110-
implementation("androidx.navigation:navigation-fragment-ktx:2.3.3")
111-
implementation("androidx.navigation:navigation-ui-ktx:2.3.3")
110+
implementation("androidx.navigation:navigation-fragment-ktx:${versions.navigation}")
111+
implementation("androidx.navigation:navigation-ui-ktx:${versions.navigation}")
112112

113113
implementation("androidx.lifecycle:lifecycle-livedata-core-ktx:${versions.lifecycle}")
114114
implementation("androidx.lifecycle:lifecycle-runtime-ktx:${versions.lifecycle}")
@@ -119,4 +119,4 @@ dependencies {
119119
implementation "dk.nodes.nstack:nstack-kotlin:${versions.nodes_nstack_kotlin}"
120120
implementation "com.jakewharton.timber:timber:${versions.timber}"
121121

122-
}
122+
}

‎app/src/main/AndroidManifest.xml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,15 @@
88
<application
99
android:name=".App"
1010
android:allowBackup="true"
11+
android:fullBackupOnly="true"
1112
android:icon="@mipmap/ic_launcher"
1213
android:label="@string/app_name"
1314
android:roundIcon="@mipmap/ic_launcher_round"
1415
android:supportsRtl="true"
1516
android:theme="@style/Theme.Androidtemplate">
16-
<activity android:name=".features.main.MainActivity">
17+
<activity
18+
android:name=".features.main.MainActivity"
19+
android:exported="true">
1720
<intent-filter>
1821
<action android:name="android.intent.action.MAIN" />
1922

@@ -38,4 +41,4 @@
3841

3942
</application>
4043

41-
</manifest>
44+
</manifest>

‎app/src/main/assets/translations_0_en-GB.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"default":{"cancel":"Cancel","ok":"Ok","no":"No","yes":"Yes","retry":"Retry","edit":"Edit","save":"Save","back":"Back","settings":"Settings","later":"Later","next":"Next","previous":"Previous","skip":"Skip","testtest":"__testtest"},"donate":{"donateButton":"Donate!","donateAgainButton":"Donate again!","title":"Help the victims now!"},"error":{"authenticationError":"Login expired, please login again.","connectionError":"No or bad connection, please try again!!!!","errorTitle":"Error","unknownError":"Unknown error, please try again.","errorRandom":"Random"}}
1+
{"default":{"cancel":"Cancel","ok":"Ok","no":"No","yes":"Yes","retry":"Retry","edit":"Edit","save":"Save","back":"Back","settings":"Settings","later":"Later","next":"Next","previous":"Previous","skip":"Skip","testtest":"__testtest"},"terms":{"termsNotFound":"Terms not found.","acceptLabel":"Accept","acceptedLabel":"Accepted"},"more":{"title":"more"},"rateReminder":{"rateReminderTitle":"Rate this app","rateReminderMessage":"It seems like you like this app, do you want to give it a rating?","title":"Rate Reminder","firstAction":"First Action","secondAction":"Second Action"},"donate":{"donateButton":"Donate!","donateAgainButton":"Donate again!","title":"Help the victims now!"},"error":{"authenticationError":"Login expired, please login again.","connectionError":"No or bad connection, please try again.","errorTitle":"Error","unknownError":"Unknown error, please try again.","errorRandom":"Random"},"home":{"title":"NStack Demo","subTitle":"Production","message":"Bacon ipsum dolor amet magna meatball jerky in, shank sunt do burgdoggen spare ribs. Lorem boudin eiusmod short ribs pastrami. Sausage bresaola do turkey, dolor qui tail ground round culpa boudin nulla minim sunt beef ribs ham. Cillum in pastrami adipisicing swine lorem, velit sunt meatloaf bresaola short loin fugiat tri-tip boudin.","toggleOff":"off","sendFeedbackButton":"Send feedback","hint":"Name","toggleOn":"On"}}

‎app/src/main/assets/translations_1_da-DK.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"default":{"cancel":"Annuller","ok":"Ok","no":"Nej","yes":"Ja","retry":"Pr\u00f8v igen","edit":"Rediger","save":"Gem","back":"Tilbage","settings":"Indstillinger","later":"Senere","next":"N\u00e6ste","previous":"Forrige","skip":"Spring over","testtest":"__testtest"},"donate":{"donateButton":"Don\u00e9r","donateAgainButton":"Don\u00e9r igen","title":"App"},"error":{"authenticationError":"Login er udl\u00f8bet, login venligst ind igen.","connectionError":"Ingen eller d\u00e5rlig forbindelse, pr\u00f8v igen.","errorTitle":"Fejl","unknownError":"Ukendt fejl, pr\u00f8v igen.","errorRandom":"Random"}}
1+
{"default":{"cancel":"Annuller","ok":"Ok","no":"Nej","yes":"Ja","retry":"Pr\u00f8v igen","edit":"Rediger","save":"Gem","back":"Tilbage","settings":"Indstillinger","later":"Senere","next":"N\u00e6ste","previous":"Forrige","skip":"Spring over","testtest":"__testtest"},"terms":{"termsNotFound":"__termsNotFound","acceptLabel":"__acceptLabel","acceptedLabel":"__acceptedLabel"},"more":{"title":"__title"},"rateReminder":{"rateReminderTitle":"__rateReminderTitle","rateReminderMessage":"__rateReminderMessage","title":"__title","firstAction":"__firstAction","secondAction":"__secondAction"},"donate":{"donateButton":"Don\u00e9r","donateAgainButton":"Don\u00e9r igen","title":"App"},"error":{"authenticationError":"Login er udl\u00f8bet, login venligst ind igen.","connectionError":"Ingen eller d\u00e5rlig forbindelse, pr\u00f8v igen.","errorTitle":"Fejl","unknownError":"Ukendt fejl, pr\u00f8v igen.","errorRandom":"Random"},"home":{"title":"__title","subTitle":"__subTitle","message":"__message","toggleOff":"__toggleOff","sendFeedbackButton":"__sendFeedbackButton","hint":"__hint","toggleOn":"__toggleOn"}}

‎app/src/main/java/com/monstarlab/App.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.monstarlab
22

3+
import android.annotation.SuppressLint
34
import android.app.Application
45
import com.monstarlab.features.nstack.Translation
56
import dagger.hilt.android.HiltAndroidApp
@@ -9,6 +10,7 @@ import timber.log.Timber
910
@HiltAndroidApp
1011
class App : Application() {
1112

13+
@SuppressLint("AppOpenMissing")
1214
override fun onCreate() {
1315
super.onCreate()
1416
NStack.translationClass = Translation::class.java

‎app/src/main/java/com/monstarlab/arch/extensions/ActivityViewBindingDelegate.kt

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@ package com.monstarlab.arch.extensions
22

33
import android.view.LayoutInflater
44
import androidx.appcompat.app.AppCompatActivity
5-
import androidx.lifecycle.Lifecycle
6-
import androidx.lifecycle.LifecycleObserver
7-
import androidx.lifecycle.OnLifecycleEvent
5+
import androidx.lifecycle.*
86
import androidx.viewbinding.ViewBinding
97
import kotlin.properties.ReadOnlyProperty
108
import kotlin.reflect.KProperty
@@ -13,20 +11,20 @@ class ActivityViewBindingDelegate<T : ViewBinding>(
1311
private val activity: AppCompatActivity,
1412
private val viewBinder: (LayoutInflater) -> T,
1513
private val beforeSetContent: () -> Unit = {}
16-
) : ReadOnlyProperty<AppCompatActivity, T>, LifecycleObserver {
14+
) : ReadOnlyProperty<AppCompatActivity, T>, DefaultLifecycleObserver {
1715

1816
private var activityBinding: T? = null
1917

2018
init {
2119
activity.lifecycle.addObserver(this)
2220
}
2321

24-
@OnLifecycleEvent(Lifecycle.Event.ON_CREATE)
25-
fun createBinding() {
22+
override fun onCreate(owner: LifecycleOwner) {
2623
initialize()
2724
beforeSetContent()
2825
activity.setContentView(activityBinding?.root)
2926
activity.lifecycle.removeObserver(this)
27+
super.onCreate(owner)
3028
}
3129

3230
private fun initialize() {

‎app/src/main/java/com/monstarlab/features/nstack/RateReminderActions.kt

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ object RateReminderActions {
99

1010
private const val CRASH = "crash"
1111
private const val DONATED = "donated"
12+
private const val FIRSTACTION = "firstaction"
13+
private const val SECONDACTION = "secondaction"
1214

1315
suspend fun crash() {
1416
send(CRASH)
@@ -18,6 +20,14 @@ object RateReminderActions {
1820
send(DONATED)
1921
}
2022

23+
suspend fun firstaction() {
24+
send(FIRSTACTION)
25+
}
26+
27+
suspend fun secondaction() {
28+
send(SECONDACTION)
29+
}
30+
2131
private suspend fun send(action: String) {
2232
NStack.RateReminder.action(action)
2333
}

‎app/src/main/java/com/monstarlab/features/nstack/Translation.java

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,40 @@ public final static class defaultSection {
2222
public static String skip = "Skip";
2323
public static String testtest = "__testtest";
2424
}
25+
public final static class terms {
26+
public static String termsNotFound = "Terms not found.";
27+
public static String acceptLabel = "Accept";
28+
public static String acceptedLabel = "Accepted";
29+
}
30+
public final static class more {
31+
public static String title = "more";
32+
}
33+
public final static class rateReminder {
34+
public static String rateReminderTitle = "Rate this app";
35+
public static String rateReminderMessage = "It seems like you like this app, do you want to give it a rating?";
36+
public static String title = "Rate Reminder";
37+
public static String firstAction = "First Action";
38+
public static String secondAction = "Second Action";
39+
}
2540
public final static class donate {
2641
public static String donateButton = "Donate!";
2742
public static String donateAgainButton = "Donate again!";
2843
public static String title = "Help the victims now!";
2944
}
3045
public final static class error {
3146
public static String authenticationError = "Login expired, please login again.";
32-
public static String connectionError = "No or bad connection, please try again!!!!";
47+
public static String connectionError = "No or bad connection, please try again.";
3348
public static String errorTitle = "Error";
3449
public static String unknownError = "Unknown error, please try again.";
3550
public static String errorRandom = "Random";
3651
}
52+
public final static class home {
53+
public static String title = "NStack Demo";
54+
public static String subTitle = "Production";
55+
public static String message = "Bacon ipsum dolor amet magna meatball jerky in, shank sunt do burgdoggen spare ribs. Lorem boudin eiusmod short ribs pastrami. Sausage bresaola do turkey, dolor qui tail ground round culpa boudin nulla minim sunt beef ribs ham. Cillum in pastrami adipisicing swine lorem, velit sunt meatloaf bresaola short loin fugiat tri-tip boudin.";
56+
public static String toggleOff = "off";
57+
public static String sendFeedbackButton = "Send feedback";
58+
public static String hint = "Name";
59+
public static String toggleOn = "On";
60+
}
3761
}

‎app/src/main/res/values/nstack_keys.xml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,15 @@
1313
<string name='nstack_default_previous' formatted='false'>{default_previous}</string>
1414
<string name='nstack_default_skip' formatted='false'>{default_skip}</string>
1515
<string name='nstack_default_testtest' formatted='false'>{default_testtest}</string>
16+
<string name='nstack_terms_termsNotFound' formatted='false'>{terms_termsNotFound}</string>
17+
<string name='nstack_terms_acceptLabel' formatted='false'>{terms_acceptLabel}</string>
18+
<string name='nstack_terms_acceptedLabel' formatted='false'>{terms_acceptedLabel}</string>
19+
<string name='nstack_more_title' formatted='false'>{more_title}</string>
20+
<string name='nstack_rateReminder_rateReminderTitle' formatted='false'>{rateReminder_rateReminderTitle}</string>
21+
<string name='nstack_rateReminder_rateReminderMessage' formatted='false'>{rateReminder_rateReminderMessage}</string>
22+
<string name='nstack_rateReminder_title' formatted='false'>{rateReminder_title}</string>
23+
<string name='nstack_rateReminder_firstAction' formatted='false'>{rateReminder_firstAction}</string>
24+
<string name='nstack_rateReminder_secondAction' formatted='false'>{rateReminder_secondAction}</string>
1625
<string name='nstack_donate_donateButton' formatted='false'>{donate_donateButton}</string>
1726
<string name='nstack_donate_donateAgainButton' formatted='false'>{donate_donateAgainButton}</string>
1827
<string name='nstack_donate_title' formatted='false'>{donate_title}</string>
@@ -21,4 +30,11 @@
2130
<string name='nstack_error_errorTitle' formatted='false'>{error_errorTitle}</string>
2231
<string name='nstack_error_unknownError' formatted='false'>{error_unknownError}</string>
2332
<string name='nstack_error_errorRandom' formatted='false'>{error_errorRandom}</string>
33+
<string name='nstack_home_title' formatted='false'>{home_title}</string>
34+
<string name='nstack_home_subTitle' formatted='false'>{home_subTitle}</string>
35+
<string name='nstack_home_message' formatted='false'>{home_message}</string>
36+
<string name='nstack_home_toggleOff' formatted='false'>{home_toggleOff}</string>
37+
<string name='nstack_home_sendFeedbackButton' formatted='false'>{home_sendFeedbackButton}</string>
38+
<string name='nstack_home_hint' formatted='false'>{home_hint}</string>
39+
<string name='nstack_home_toggleOn' formatted='false'>{home_toggleOn}</string>
2440
</resources>

‎build.gradle

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,29 @@
22
buildscript {
33

44
ext.versions = [
5-
kotlin : '1.4.30',
6-
appcompat : '1.2.0',
7-
coroutines : '1.4.2',
8-
constraint_layout : '2.0.1',
9-
dagger : '2.33',
10-
hilt : '2.33-beta',
11-
lifecycle : '2.3.0',
5+
kotlin_plugin : '1.6.0',
6+
kotlin : '1.4.10',
7+
appcompat : '1.4.0',
8+
coroutines : '1.5.2',
9+
json : '1.0.1',
10+
constraint_layout : '2.1.2',
11+
hilt : '2.39.1',
12+
lifecycle : '2.4.0',
1213
timber : "4.7.1",
13-
junit : '4.13.1',
14-
espresso : '3.3.0',
14+
junit : '4.13.2',
15+
junit_ext : '1.1.3',
16+
espresso : '3.4.0',
1517
mockito : '3.3.3',
1618
nstack : '3.2.5',
1719
nodes_arch : '2.3.5',
1820
retrofit : '2.9.0',
21+
retrofit_converter : '0.8.0',
1922
okhttp : '4.9.0',
20-
ktx : '1.3.2',
21-
material : '1.2.1',
23+
ktx_core : '1.7.0',
24+
ktx : '1.7.0',
25+
material : '1.4.0',
2226
archCore : '2.1.0',
23-
navigation : '2.3.0',
27+
navigation : '2.3.5',
2428
nodes_utils : '1.0.0',
2529
nodes_utils_okhttp : '0.12.2',
2630
preferences : '1.1.1',
@@ -42,8 +46,8 @@ buildscript {
4246
jcenter()
4347
}
4448
dependencies {
45-
classpath "com.android.tools.build:gradle:4.1.2"
46-
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}"
49+
classpath 'com.android.tools.build:gradle:7.0.3'
50+
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin_plugin}"
4751
classpath "dk.nodes.nstack:translation:${versions.nstack_gradle_plugin}"
4852
classpath "com.google.dagger:hilt-android-gradle-plugin:${versions.hilt}"
4953
// NOTE: Do not place your application dependencies here; they belong
@@ -71,4 +75,4 @@ subprojects {
7175
targetExclude("**/RateReminderActions.kt")
7276
}
7377
}
74-
}
78+
}

‎gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#Mon Jan 04 10:11:01 CET 2021
22
distributionBase=GRADLE_USER_HOME
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
44
distributionPath=wrapper/dists
55
zipStorePath=wrapper/dists
66
zipStoreBase=GRADLE_USER_HOME

0 commit comments

Comments
 (0)