Skip to content

Commit f044720

Browse files
committed
chore: update dependencies
1 parent 65991e9 commit f044720

File tree

5 files changed

+13
-16
lines changed

5 files changed

+13
-16
lines changed

app/build.gradle

+4-4
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ android {
1111
applicationId "fr.corenting.edcompanion"
1212
minSdkVersion 21
1313
targetSdkVersion 36
14-
versionCode 74
15-
versionName "2.30.2"
14+
versionCode 75
15+
versionName "2.31"
1616
vectorDrawables.useSupportLibrary = true
1717

1818
buildConfigField "String", "FRONTIER_AUTH_CLIENT_ID", '"' + FRONTIER_AUTH_CLIENT_ID + '"'
@@ -81,8 +81,8 @@ dependencies {
8181

8282
// Other
8383
implementation 'com.makeramen:roundedimageview:2.3.0'
84-
implementation 'com.google.code.gson:gson:2.11.0'
85-
implementation 'com.jakewharton.threetenabp:threetenabp:1.4.7'
84+
implementation 'com.google.code.gson:gson:2.12.1'
85+
implementation 'com.jakewharton.threetenabp:threetenabp:1.4.9'
8686
implementation 'org.greenrobot:eventbus:3.3.1'
8787
implementation 'me.zhanghai.android.materialprogressbar:library:1.6.1'
8888
implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0'

app/src/main/java/fr/corenting/edcompanion/activities/MainActivity.kt

+1
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,7 @@ class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelecte
119119
super.onSaveInstanceState(outState)
120120
}
121121

122+
@Deprecated("Deprecated in Java")
122123
override fun onBackPressed() {
123124
if (binding.drawerLayout.isDrawerOpen(GravityCompat.START)) {
124125
binding.drawerLayout.closeDrawer(GravityCompat.START)

app/src/main/java/fr/corenting/edcompanion/fragments/CommanderStatusFragment.kt

+3-1
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,13 @@ class CommanderStatusFragment : Fragment() {
4040
}
4141

4242
private var frontierLoginNeeded: Boolean = false
43+
private val frontierLoginNeededLock = Any()
4344

4445
private var _binding: FragmentCommanderStatusBinding? = null
4546
private val binding get() = _binding!!
4647
private val viewModel: CommanderViewModel by activityViewModels()
4748

49+
4850
override fun onCreateView(
4951
inflater: LayoutInflater, container: ViewGroup?,
5052
savedInstanceState: Bundle?
@@ -189,7 +191,7 @@ class CommanderStatusFragment : Fragment() {
189191
endLoading()
190192

191193
// Show dialog but only once
192-
synchronized(frontierLoginNeeded) {
194+
synchronized(frontierLoginNeededLock) {
193195
if (frontierLoginNeeded) {
194196
return
195197
}

app/src/main/res/values/strings.xml

+4-10
Original file line numberDiff line numberDiff line change
@@ -408,17 +408,11 @@
408408
<string name="changelog_title">Changelog</string>
409409
<string name="changelog_message">
410410
<![CDATA[
411-
<b>Version 2.30.2</b><br />
411+
<b>Version 2.31</b><br />
412412
<ul>
413-
<li>Fix Python Mk II displayed as "Python_NX"</li><br />
414-
</ul>
415-
<b>Version 2.30.1</b><br />
416-
<ul>
417-
<li>Fix some issues displaying loadouts details</li><br />
418-
</ul>
419-
<b>Version 2.30</b><br />
420-
<ul>
421-
<li>Fix an issue loading loadouts data from Frontier for some users</li><br />
413+
<li>Update for Android 16</li><br />
414+
<li>Fix header in menu being cut</li><br />
415+
<li>Fix typos</li><br />
422416
</ul>
423417
]]>
424418
</string>

build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22

33
buildscript {
4-
ext.kotlin_version = '2.0.21'
4+
ext.kotlin_version = '2.1.10'
55

66
repositories {
77
google()

0 commit comments

Comments
 (0)