Skip to content

Commit 779445d

Browse files
committed
- add : per-app languages
- upgrade : targetSdk and gradle version
1 parent e2aa084 commit 779445d

8 files changed

Lines changed: 28 additions & 16 deletions

File tree

build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
plugins {
2-
id("com.android.application") version "8.0.2" apply false
3-
id("com.android.library") version "8.0.2" apply false
2+
id("com.android.application") version "8.2.1" apply false
3+
id("com.android.library") version "8.2.1" apply false
44
id("org.jetbrains.kotlin.android") version "1.9.22" apply false
55
}
66

77
buildscript {
88
dependencies {
9-
classpath("com.android.tools.build:gradle:8.0.2")
9+
classpath("com.android.tools.build:gradle:8.2.1")
1010
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.22")
1111
}
1212
}

floatstat/build.gradle.kts

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,21 @@ plugins {
55

66
android {
77
namespace = "id.psw.floatstat"
8-
compileSdk = 33
8+
compileSdk = 34
99

1010
defaultConfig {
1111
applicationId = "id.psw.floatstat"
1212
minSdk = 19
13-
targetSdk = 33
14-
versionCode = 3
15-
versionName = "1.0.2"
13+
targetSdk = 34
14+
versionCode = 4
15+
versionName = "1.0.4"
1616

1717
testInstrumentationRunner= "androidx.test.runner.AndroidJUnitRunner"
1818
}
1919

2020
buildTypes {
2121
getByName("release") {
22-
isMinifyEnabled = false
22+
isMinifyEnabled = true
2323
proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
2424
}
2525
}
@@ -30,13 +30,17 @@ android {
3030
kotlinOptions {
3131
jvmTarget = "1.8"
3232
}
33+
34+
androidResources {
35+
generateLocaleConfig = true
36+
}
3337
}
3438

3539
dependencies {
36-
implementation("androidx.core:core-ktx:1.7.0")
37-
implementation("androidx.appcompat:appcompat:1.4.1")
40+
implementation("androidx.appcompat:appcompat:1.6.1")
41+
implementation("androidx.core:core:1.13.1")
42+
implementation("androidx.recyclerview:recyclerview:1.3.2")
3843
implementation(project(mapOf("path" to ":floatstat_lib")))
39-
implementation("androidx.recyclerview:recyclerview:1.2.1")
4044
testImplementation("junit:junit:4.13.2")
4145
androidTestImplementation("androidx.test.ext:junit:1.1.3")
4246
androidTestImplementation("androidx.test.espresso:espresso-core:3.4.0")

floatstat/src/main/AndroidManifest.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3+
xmlns:tools="http://schemas.android.com/tools"
34
package="id.psw.floatstat">
45

56
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
67
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
78
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
89
<uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
10+
<uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC"
11+
tools:ignore="SystemPermissionTypo" />
912
<uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
1013
<!-- No Android Go or Android devices identifying itself as Low RAM which is introduced since API 27,
1114
Since they usually did not support floating window -->
@@ -53,6 +56,7 @@
5356
android:enabled="true"
5457
android:label="@string/svc_name"
5558
android:exported="false"
59+
android:foregroundServiceType="dataSync"
5660
>
5761
<intent-filter>
5862
<action android:name="id.psw.temperamon.action.VISIBILITY"/>

floatstat/src/main/res/layout/plugin_selector_title.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,5 +29,5 @@
2929
android:contentDescription="@string/what_what"
3030
android:scaleType="fitCenter"
3131
android:src="@drawable/ic_menu"
32-
app:srcCompat="@drawable/ic_menu" />
32+
/>
3333
</RelativeLayout>
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
unqualifiedResLocale=en-US
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#Tue May 03 09:45:33 ICT 2022
22
distributionBase=GRADLE_USER_HOME
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
44
distributionPath=wrapper/dists
55
zipStorePath=wrapper/dists
66
zipStoreBase=GRADLE_USER_HOME

plugin_example/build.gradle.kts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ plugins {
55

66
android {
77
namespace = "id.psw.floatstat.plugin_example"
8-
compileSdk = 31
8+
compileSdk = 34
99

1010
defaultConfig {
1111
applicationId = "id.psw.floatstat.plugin_example"
1212
minSdk = 19
13-
targetSdk = 31
13+
targetSdk = 34
1414
versionCode = 1
1515
versionName ="1.0"
1616

@@ -30,9 +30,11 @@ android {
3030
kotlinOptions {
3131
jvmTarget = "1.8"
3232
}
33+
androidResources {
34+
generateLocaleConfig = true
35+
}
3336
}
3437

3538
dependencies {
3639
implementation(project(mapOf("path" to ":floatstat_lib")))
37-
implementation ("androidx.core:core:1.7.0")
3840
}
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
unqualifiedResLocale=en-US

0 commit comments

Comments
 (0)