Skip to content

Commit 34ccb4a

Browse files
committed
- Updated targetSdkVersion to 31 (Android 12)
1 parent da02155 commit 34ccb4a

File tree

6 files changed

+34
-24
lines changed

6 files changed

+34
-24
lines changed

README.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ The Android App JobLogTimer keeps track of the time you work and alarms your to
44

55
# ChangeLog
66

7+
V0.18: versionCode 16, 09.10.2021 Mr
8+
- Updated targetSdkVersion to 31 (Android 12)
9+
710
V0.17: versionCode 15, 08.10.2020 Mr
811
- Updated targetSdkVersion to 30 (Android 11)
912

app/build.gradle

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apply plugin: 'com.android.application'
22

33
android {
4-
compileSdkVersion 30
4+
compileSdkVersion 31
55

66
/*
77
V7: Android 2.1.x ECLAIR_MR1
@@ -21,13 +21,14 @@ android {
2121
V28: Android 9 PIE
2222
V29: Android 10 Q
2323
V30: Android 11 R
24+
V31: Android 12 S
2425
*/
2526
defaultConfig {
2627
applicationId "de.euhm.jlt"
2728
minSdkVersion 14
28-
targetSdkVersion 30
29-
versionCode 15
30-
versionName "0.17"
29+
targetSdkVersion 31
30+
versionCode 16
31+
versionName "0.18"
3132
}
3233

3334
signingConfigs {
@@ -52,9 +53,9 @@ android {
5253
}
5354

5455
dependencies {
55-
implementation 'androidx.appcompat:appcompat:1.2.0'
56+
implementation 'androidx.appcompat:appcompat:1.3.1'
5657
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
57-
implementation 'com.google.android.material:material:1.2.1'
58+
implementation 'com.google.android.material:material:1.4.0'
5859
}
5960

6061
System.setProperty('java.awt.headless', 'false')

app/src/main/AndroidManifest.xml

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@
1717
tools:ignore="GoogleAppIndexingWarning" >
1818
<activity
1919
android:name=".MainActivity"
20-
android:label="@string/title_activity_main" >
20+
android:label="@string/title_activity_main"
21+
android:exported="true" >
2122

2223
<!--
2324
android:launchMode="singleTop"
@@ -37,7 +38,8 @@
3738
</activity>
3839

3940
<receiver android:name=".MainWidgetProvider"
40-
android:label="@string/app_name" >
41+
android:label="@string/app_name"
42+
android:exported="true" >
4143
<intent-filter>
4244
<action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
4345
</intent-filter>
@@ -46,28 +48,32 @@
4648
android:resource="@xml/widget_info" />
4749
</receiver>
4850

49-
<receiver android:name=".receivers.StartStopReceiver" >
51+
<receiver android:name=".receivers.StartStopReceiver"
52+
android:exported="false" >
5053
<intent-filter>
5154
<action android:name="${packageName}.START_STOP" />
5255
<category android:name="android.intent.category.DEFAULT" />
5356
</intent-filter>
5457
</receiver>
5558

56-
<receiver android:name=".receivers.AlarmReceiver" >
59+
<receiver android:name=".receivers.AlarmReceiver"
60+
android:exported="false" >
5761
<intent-filter>
5862
<action android:name="${packageName}.NORMAL_WORK_ALARM" />
5963
<category android:name="android.intent.category.DEFAULT" />
6064
</intent-filter>
6165
</receiver>
6266

63-
<receiver android:name=".receivers.PowerStateChangedReceiver">
67+
<receiver android:name=".receivers.PowerStateChangedReceiver"
68+
android:exported="true" >
6469
<intent-filter>
6570
<action android:name="android.intent.action.BATTERY_LOW"/>
6671
<action android:name="android.intent.action.BATTERY_OKAY"/>
6772
</intent-filter>
6873
</receiver>
6974

70-
<receiver android:name=".receivers.OnBootReceiver">
75+
<receiver android:name=".receivers.OnBootReceiver"
76+
android:exported="true" >
7177
<intent-filter>
7278
<action android:name="android.intent.action.BOOT_COMPLETED"/>
7379
</intent-filter>

app/src/main/res/layout/activity_main.xml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -56,16 +56,16 @@
5656
android:theme="@style/AppTheme.AppBar"
5757
app:popupTheme="@style/AppTheme.PopupOverlay" />
5858

59-
<com.google.android.material.tabs.TabLayout
60-
android:id="@+id/tabLayout"
61-
android:layout_width="match_parent"
62-
android:layout_height="wrap_content"
63-
android:layout_gravity="top"
64-
android:background="@color/tabLayout"
65-
app:tabBackground="@color/tabLayout"
66-
app:tabIndicatorColor="@color/toolbar"
67-
app:tabIndicatorHeight="4dp"
68-
app:tabMode="fixed" />
59+
<com.google.android.material.tabs.TabLayout
60+
android:id="@+id/tabLayout"
61+
android:layout_width="match_parent"
62+
android:layout_height="?attr/actionBarSize"
63+
android:layout_gravity="top"
64+
android:background="@color/tabLayout"
65+
app:tabBackground="@color/tabLayout"
66+
app:tabIndicatorColor="@color/toolbar"
67+
app:tabIndicatorHeight="4dp"
68+
app:tabMode="fixed" />
6969
</com.google.android.material.appbar.AppBarLayout>
7070

7171
<!-- <android.support.v4.view.ViewPager -->

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ buildscript {
55
google()
66
}
77
dependencies {
8-
classpath 'com.android.tools.build:gradle:4.0.2'
8+
classpath 'com.android.tools.build:gradle:4.2.2'
99
}
1010
}
1111

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip

0 commit comments

Comments
 (0)