Skip to content

Commit 9478dba

Browse files
committed
Revert "v2.12.3"
1 parent 2a6bac1 commit 9478dba

File tree

13 files changed

+54
-156
lines changed

13 files changed

+54
-156
lines changed

.github/workflows/fossa.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,16 @@ jobs:
1010
runs-on: ubuntu-latest
1111
steps:
1212
- name: Setup JDK
13-
uses: actions/setup-java@v5
13+
uses: actions/setup-java@v4
1414
with:
1515
distribution: 'temurin'
1616
java-version: '17'
1717
- name: Checkout code
18-
uses: actions/checkout@v5
18+
uses: actions/checkout@v4
1919
- name: Add exec permission
2020
run: chmod +x gradlew
2121
- name: Validate Gradle Wrapper
22-
uses: gradle/actions/wrapper-validation@v5
22+
uses: gradle/actions/wrapper-validation@v4
2323
- name: Disable configuration cache
2424
run: echo -e "\norg.gradle.unsafe.configuration-cache=false\n" >> gradle.properties
2525
#- name: Generate dependencies report

.github/workflows/gradleCI.yml

Lines changed: 18 additions & 88 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: 🔨 Gradle Build
22

3-
on:
3+
on:
44
push:
55
paths-ignore:
66
- 'docs/**'
@@ -20,105 +20,35 @@ jobs:
2020

2121
runs-on: ubuntu-latest
2222

23-
permissions:
24-
id-token: write
25-
attestations: write
26-
contents: write
27-
2823
steps:
29-
- name: ⬇️ Checkout repository
30-
uses: actions/checkout@v5
31-
32-
- name: ♨️ JDK
33-
uses: actions/setup-java@v5
24+
- uses: actions/checkout@v4
25+
- name: Setup JDK
26+
uses: actions/setup-java@v4
3427
with:
3528
distribution: 'temurin'
36-
java-version: '21'
37-
check-latest: true
38-
39-
- name: ❎ Add exec permission
29+
java-version: '17'
30+
- name: Add exec permission
4031
run: chmod +x gradlew
41-
42-
- name: 🕵️ Validate Gradle Wrapper
43-
uses: gradle/actions/wrapper-validation@v5
44-
45-
- name: 🔐 Decrypt keystore
46-
run: |
47-
echo "${{secrets.KEYSTORE}}" > github_release.jks.asc
48-
gpg -d --passphrase "${{secrets.KEYSTORE_FILE_PASSWORD}}" --batch --output github_release.jks github_release.jks.asc
49-
50-
- name: 🎁 Build
51-
run: |
52-
./gradlew build
53-
54-
- name: 🎁 Build release (common key)
55-
run: |
56-
./gradlew assembleRelease \
57-
--project-prop keyStore.release.storeFile=../github_release.jks \
58-
--project-prop keyStore.release.storePassword=${{secrets.KEYSTORE_PASSWORD}} \
59-
--project-prop keyStore.release.keyAlias=${{secrets.KEYSTORE_KEY_ALIAS_2}} \
60-
--project-prop keyStore.release.keyPassword=${{secrets.KEYSTORE_KEY_PASSWORD_2}}
61-
62-
- name: 🔖 Rename apk file
63-
run: |
64-
mv app/build/outputs/apk/release/app-release.apk screenshottile_commit_${{ github.sha }}.apk
65-
66-
- name: 📜 Attest
67-
uses: actions/attest-build-provenance@v3
68-
with:
69-
subject-path: 'screenshottile_commit_${{ github.sha }}.apk'
70-
71-
- name: 🤖 Upload apk
32+
- name: Validate Gradle Wrapper
33+
uses: gradle/actions/wrapper-validation@v4
34+
- name: 🔨 Build
35+
run: ./gradlew build
36+
- name: Upload .apk files
7237
uses: actions/upload-artifact@v4
7338
with:
74-
name: signed-apk
75-
path: screenshottile_commit_${{ github.sha }}.apk
76-
77-
- name: 🎁 Build release (release key)
78-
if: ${{ github.ref_type == 'tag' }}
79-
run: |
80-
./gradlew assembleRelease \
81-
--project-prop keyStore.release.storeFile=../github_release.jks \
82-
--project-prop keyStore.release.storePassword=${{secrets.KEYSTORE_PASSWORD}} \
83-
--project-prop keyStore.release.keyAlias=${{secrets.KEYSTORE_KEY_ALIAS}} \
84-
--project-prop keyStore.release.keyPassword=${{secrets.KEYSTORE_KEY_PASSWORD}}
85-
39+
name: apk-files
40+
path: app/build/outputs/apk/**/*.apk
8641
- name: 💬 Upload Lint report
8742
if: always()
8843
uses: actions/upload-artifact@v4
8944
with:
9045
name: lint-results.html
9146
path: app/build/reports/lint-results*.html
92-
93-
- name: 🏷️ Extract versionCode
94-
if: ${{ github.ref_type == 'tag' }}
95-
id: version
96-
run: |
97-
versionCode=$(grep -Po "versionCode\s+\K[0-9]+" app/build.gradle)
98-
echo "versionCode: $versionCode"
99-
echo "versionCode=$versionCode" >> $GITHUB_OUTPUT
100-
101-
- name: 🔖 Rename apk file
102-
if: ${{ github.ref_type == 'tag' }}
103-
run: |
104-
mv app/build/outputs/apk/release/app-release.apk screenshottile_gh_${{ steps.version.outputs.versionCode }}.apk
105-
106-
- name: 📜 Attest
107-
if: ${{ github.ref_type == 'tag' }}
108-
uses: actions/attest-build-provenance@v3
109-
with:
110-
subject-path: 'screenshottile_gh_${{ steps.version.outputs.versionCode }}.apk'
111-
112-
- name: 🤖 Upload apk
113-
if: ${{ github.ref_type == 'tag' }}
47+
- name: 💬 Upload tests report
48+
if: always()
11449
uses: actions/upload-artifact@v4
11550
with:
116-
name: release-apk
117-
path: screenshottile_gh_${{ steps.version.outputs.versionCode }}.apk
51+
name: reports-tests
52+
path: app/build/reports/tests/
53+
11854

119-
- name: 🎉 Publish Github release
120-
if: false
121-
uses: softprops/action-gh-release@v2
122-
with:
123-
files: screenshottile_gh_${{ steps.version.outputs.versionCode }}.apk
124-
body_path: fastlane/metadata/android/en-US/changelogs/${{ steps.version.outputs.versionCode }}.txt

.github/workflows/instrumentTests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ jobs:
3636
- "zh-CN"
3737
steps:
3838
- name: Checkout
39-
uses: actions/checkout@v5
39+
uses: actions/checkout@v4
4040

4141
- name: Setup JDK
42-
uses: actions/setup-java@v5
42+
uses: actions/setup-java@v4
4343
with:
4444
distribution: 'temurin'
4545
java-version: '17'

.github/workflows/validateFastlane.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ jobs:
77
validateFastlane:
88
runs-on: ubuntu-latest
99
steps:
10-
- uses: actions/checkout@v5
10+
- uses: actions/checkout@v4
1111
- uses: ashutoshgngwr/validate-fastlane-supply-metadata@v2

app/build.gradle

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,6 @@ android {
1919
keyPassword 'password'
2020
}
2121
}
22-
debug {
23-
storeFile rootProject.file('app/debug.keystore')
24-
}
2522
}
2623
defaultConfig {
2724
applicationId 'com.github.cvzi.screenshottile'
@@ -30,8 +27,8 @@ android {
3027
compileSdk libs.versions.sdk.compile.get().toInteger()
3128
targetSdk libs.versions.sdk.target.get().toInteger()
3229

33-
versionCode 130
34-
versionName '2.12.3'
30+
versionCode 129
31+
versionName '2.12.2'
3532

3633
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
3734
buildConfigField 'com.github.cvzi.screenshottile.MutableBoolean', 'TESTING_MODE', 'new com.github.cvzi.screenshottile.MutableBoolean(false)'
@@ -87,7 +84,6 @@ android {
8784
dependencies {
8885
implementation platform(libs.kotlin.bom)
8986
implementation libs.bundles.implementation.app
90-
implementation libs.documentfile
9187
androidTestImplementation libs.bundles.android.test
9288
testImplementation libs.bundles.test
9389
}

app/debug.keystore

-2.73 KB
Binary file not shown.

app/src/main/java/com/github/cvzi/screenshottile/activities/MainActivity.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import android.graphics.drawable.Icon
1616
import android.net.Uri
1717
import android.os.Build
1818
import android.os.Bundle
19+
import android.text.Html
1920
import android.text.method.LinkMovementMethod
2021
import android.util.Log
2122
import android.view.View
@@ -24,7 +25,6 @@ import android.widget.ImageView
2425
import android.widget.TextView
2526
import androidx.annotation.RequiresApi
2627
import androidx.appcompat.app.AlertDialog
27-
import androidx.core.text.HtmlCompat
2828
import androidx.databinding.DataBindingUtil
2929
import com.github.cvzi.screenshottile.App
3030
import com.github.cvzi.screenshottile.BR
@@ -96,9 +96,9 @@ class MainActivity : BaseAppCompatActivity() {
9696

9797
val textDescTranslate = binding.textDescTranslate
9898
textDescTranslate.movementMethod = LinkMovementMethod()
99-
textDescTranslate.text = HtmlCompat.fromHtml(
99+
textDescTranslate.text = Html.fromHtml(
100100
getLocalizedString(R.string.translate_this_app_text),
101-
HtmlCompat.FROM_HTML_MODE_LEGACY
101+
Html.FROM_HTML_SEPARATOR_LINE_BREAK_DIV
102102
)
103103

104104
val switchLegacy = binding.switchLegacy

docs/.well-known/assetlinks.json

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,4 @@
11
[
2-
{
3-
"relation":
4-
[
5-
"delegate_permission/common.handle_all_urls"
6-
],
7-
"target":
8-
{
9-
"namespace": "android_app",
10-
"package_name": "com.github.cvzi.wallpaperexport",
11-
"sha256_cert_fingerprints":
12-
[
13-
"33:4D:32:5A:41:E8:80:9D:D2:1A:E9:C5:40:2D:6D:63:7F:A9:4A:C5:61:A8:C9:69:02:19:4F:B3:37:EB:D8:D7"
14-
]
15-
}
16-
},
17-
{
18-
"relation":
19-
[
20-
"delegate_permission/common.handle_all_urls"
21-
],
22-
"target":
23-
{
24-
"namespace": "android_app",
25-
"package_name": "com.github.cvzi.darkmodewallpaper",
26-
"sha256_cert_fingerprints":
27-
[
28-
"48:24:53:5C:BA:4E:FB:87:46:97:F8:88:04:23:89:78:06:D8:8D:1B:D4:C6:FD:2A:EF:BE:55:AB:55:01:56:7D"
29-
]
30-
}
31-
},
322
{
333
"relation":
344
[

gradle/libs.versions.toml

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,29 @@
11
[versions]
2-
agp = "8.13.0"
2+
agp = "8.8.2"
33
annotation = "1.9.1"
4-
appcompat = "1.7.1"
5-
bcutilJdk18on = "1.82"
4+
appcompat = "1.7.0"
5+
bcutilJdk18on = "1.80"
66
cardview = "1.0.0"
77
constraintlayout = "2.2.1"
8-
core = "1.7.0"
9-
runner = "1.7.0"
10-
espressoCore = "3.7.0"
11-
junit = "1.3.0"
8+
core = "1.6.1"
9+
runner = "1.6.2"
10+
espressoCore = "3.6.1"
11+
junit = "1.2.1"
1212
junitVersion = "4.13.2"
13-
kotlin = "2.2.20"
14-
kotlinBom = "2.2.20"
15-
kotlinxCoroutinesAndroid = "1.10.2"
16-
lifecycleViewmodelKtx = "2.9.4"
17-
material = "1.13.0"
13+
kotlin = "2.1.10"
14+
kotlinBom = "2.1.10"
15+
kotlinxCoroutinesAndroid = "1.10.1"
16+
lifecycleViewmodelKtx = "2.8.7"
17+
material = "1.12.0"
1818
photoeditor = "3.0.2"
1919
preferenceKtx = "1.2.1"
20-
robolectric = "4.16"
21-
sdk-compile = "36"
20+
robolectric = "4.14.1"
21+
sdk-compile = "35"
2222
sdk-min = "24"
23-
sdk-target = "36"
24-
sonarqube = "7.0.0.6105"
25-
truth = "1.7.0"
23+
sdk-target = "35"
24+
sonarqube = "6.0.1.5171"
25+
truth = "1.6.0"
2626
viewpager = "1.1.0"
27-
documentfile = "1.1.0"
2827

2928
[libraries]
3029
annotation = { module = "androidx.annotation:annotation", version.ref = "annotation" }
@@ -51,7 +50,6 @@ rules = { module = "androidx.test:rules", version.ref = "core" }
5150
runner = { module = "androidx.test:runner", version.ref = "runner" }
5251
truth = { module = "androidx.test.ext:truth", version.ref = "truth" }
5352
viewpager = { module = "androidx.viewpager:viewpager", version.ref = "viewpager" }
54-
documentfile = { group = "androidx.documentfile", name = "documentfile", version.ref = "documentfile" }
5553

5654

5755
[bundles]

gradle/wrapper/gradle-wrapper.jar

-1.65 KB
Binary file not shown.

0 commit comments

Comments
 (0)