Skip to content

Commit 337ee2f

Browse files
hushenghaohushenghao
committed
Merge branch 'release/1.9.4'
2 parents 7068bae + 0ee94ac commit 337ee2f

File tree

145 files changed

+2944
-2072
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

145 files changed

+2944
-2072
lines changed

‎.github/workflows/build.yml‎

Lines changed: 35 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,9 @@ name: Android CI
22

33
on:
44
push:
5-
# branches: [ master ]
5+
# branches: [ release/1.9.4 ]
66
tags:
77
- 'v*'
8-
# pull_request:
9-
# branches: [ master ]
108

119
jobs:
1210
build:
@@ -15,53 +13,53 @@ jobs:
1513
steps:
1614
- uses: actions/checkout@v2
1715

18-
- name: set up JDK 11
16+
- name: set up JDK
1917
uses: actions/setup-java@v2
2018
with:
21-
java-version: '11'
19+
java-version: '17'
2220
distribution: 'adopt'
2321
cache: gradle
2422

23+
- name: Retrieve the secret and decode it to a file
24+
env:
25+
KEYSTORE_BASE64: ${{ secrets.KEYSTORE_BASE64 }}
26+
KEY_PROPERTIES_BASE64: ${{ secrets.KEY_PROPERTIES_BASE64 }}
27+
run: |
28+
echo "$KEY_PROPERTIES_BASE64" | base64 --decode > key.properties
29+
echo "$KEYSTORE_BASE64" | base64 --decode > keystore.jks
30+
31+
- name: Print root files
32+
run: ls -l
33+
2534
- name: Grant execute permission for gradlew
2635
run: chmod +x gradlew
36+
2737
- name: Build with Gradle
2838
run: ./gradlew assembleRelease
29-
39+
3040
- name: Stop gradle daemon
3141
run: ./gradlew --stop
32-
33-
# if: contains(github.ref, 'tags/')
34-
42+
43+
- name: Get Change logs
44+
id: get-change-logs
45+
run: |
46+
CHANGE_LOGS=`ls -r fastlane/metadata/android/en-US/changelogs | head -1`
47+
echo "CHANGE_LOGS=$CHANGE_LOGS" >> "$GITHUB_OUTPUT"
48+
3549
- name: Create Release
3650
id: create_release
37-
uses: actions/create-release@v1
38-
env:
39-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token
51+
uses: ncipollo/release-action@v1
4052
with:
41-
tag_name: ${{ github.ref }}
42-
release_name: Release ${{ github.ref }}
43-
# body: |
44-
# Changes in this Release
45-
# - First Change
46-
# - Second Change
53+
token: ${{ secrets.GITHUB_TOKEN }}
54+
tag: ${{ github.ref }}
55+
name: Release ${{ github.ref }}
56+
# tag: v1.9.4-prerelease
57+
# name: PreRelease v1.9.4
58+
# commit: release/1.9.4
4759
draft: false
4860
prerelease: false
49-
50-
- name: Get Apk Name
51-
id: get-apk-name
52-
run: |
53-
APK_NAME=`cd ./app/build/outputs/apk/release && ls *.apk`
54-
echo ::set-output name=apk_name::$APK_NAME
55-
56-
- name: Upload Release Asset
57-
id: upload-release-asset
58-
uses: actions/upload-release-asset@v1
59-
env:
60-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
61-
with:
62-
upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps
63-
asset_path: ./app/build/outputs/apk/release/${{ steps.get-apk-name.outputs.apk_name }}
64-
asset_name: Easter_Eggs_debug.apk
65-
asset_content_type: application/vnd.android.package-archive
66-
67-
61+
bodyFile: fastlane/metadata/android/en-US/changelogs/${{ steps.get-change-logs.outputs.CHANGE_LOGS }}
62+
artifacts: ./app/build/outputs/apk/release/*.apk
63+
artifactContentType: application/vnd.android.package-archive
64+
allowUpdates: true
65+
updateOnlyUnreleased: true

‎.idea/compiler.xml‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/gradle.xml‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/kotlinc.xml‎

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/misc.xml‎

Lines changed: 1 addition & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Gemfile.lock‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ GEM
105105
xcodeproj (>= 1.13.0, < 2.0.0)
106106
xcpretty (~> 0.3.0)
107107
xcpretty-travis-formatter (>= 0.0.3)
108-
fastlane-plugin-pgyer (0.2.4)
108+
fastlane-plugin-pgyer (0.2.5)
109109
gh_inspector (1.1.3)
110110
google-apis-androidpublisher_v3 (0.32.0)
111111
google-apis-core (>= 0.9.1, < 2.a)

‎README.md‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,20 +31,20 @@ The project contains the complete code of the system Easter eggs, which aims to
3131
| Android 10 (Queen Cake) | 29 | Icon Quiz | ✅ | ❌ | - |
3232
| Android 9 (Pie) | 28 | PAINT.APK | ✅ | ❌ | - |
3333
| Android 8.0~8.1 (Oreo) | 26~27 | Octopus | ✅ | ❌ | - |
34-
| Android 7.0~7.1.2 (Nougat) | 24~25 | Neko | ✅ | ✅ | 24 |
35-
| Android 6.0~6.0.1 (Marshmallow) | 23 | Marshmallow Land | ✅ | ❌ | - |
34+
| Android 7.0~7.1 (Nougat) | 24~25 | Neko | ✅ | ✅ | 24 |
35+
| Android 6.0 (Marshmallow) | 23 | Marshmallow Land | ✅ | ❌ | - |
3636
| Android 5.0~5.1 (Lollipop) | 21~22 | L Land | ✅ | ❌ | - |
37-
| Android 4.4~4.4.4 (KitKat) | 19~20 | Dessert Case | ✅ | ❌ | - |
37+
| Android 4.4~4.4W (KitKat) | 19~20 | Dessert Case | ✅ | ❌ | - |
3838
| Android 4.1~4.3 (Jelly Bean) | 16~18 | BeanBag | ✅ | ❌ | - |
39-
| Android 4.0~4.0.4 (Ice Cream Sandwich) | 14~15 | Nyandroid | ✅ | ❌ | - |
39+
| Android 4.0~4.0.3 (Ice Cream Sandwich) | 14~15 | Nyandroid | ✅ | ❌ | - |
4040
| Android 3.0~3.2 (Honeycomb) | 11~13 | Honeycomb [*](#id_egg_name) | ✅ | ❌ | - |
41-
| Android 2.3~2.3.7 (Gingerbread) | 9~10 | Gingerbread [*](#id_egg_name) | ✅ | ❌ | - |
42-
| Android 2.2~2.2.3 (Froyo) | 8 | - | - | - | - |
41+
| Android 2.3~2.3.3 (Gingerbread) | 9~10 | Gingerbread [*](#id_egg_name) | ✅ | ❌ | - |
42+
| Android 2.2 (Froyo) | 8 | - | - | - | - |
4343
| Android 2.0~2.1 (Eclair) | 5~7 | - | - | - | - |
4444
| Android 1.6 (Donut) | 4 | - | - | - | - |
4545
| Android 1.5 (Cupcake) | 3 | - | - | - | - |
4646
| Android 1.1 (Petit Four) | 2 | - | - | - | - |
47-
| Android 1.0 | 1 | - | - | - | - |
47+
| Android 1.0 (Base) | 1 | - | - | - | - |
4848

4949
* <span id='id_new_features'>Easter eggs with new features of the system are used, and the old version of the system can only use some functions.</span>
5050
* <span id='id_full_egg_mini_sdk'>The minimum SDK version required to fully experience Easter Egg.</span>

‎README_zh.md‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,20 +31,20 @@
3131
| Android 10 (Queen Cake) | 29 | Icon Quiz | ✅ | ❌ | - |
3232
| Android 9 (Pie) | 28 | PAINT.APK | ✅ | ❌ | - |
3333
| Android 8.0~8.1 (Oreo) | 26~27 | Octopus | ✅ | ❌ | - |
34-
| Android 7.0~7.1.2 (Nougat) | 24~25 | Neko | ✅ | ✅ | 24 |
35-
| Android 6.0~6.0.1 (Marshmallow) | 23 | Marshmallow Land | ✅ | ❌ | - |
34+
| Android 7.0~7.1 (Nougat) | 24~25 | Neko | ✅ | ✅ | 24 |
35+
| Android 6.0 (Marshmallow) | 23 | Marshmallow Land | ✅ | ❌ | - |
3636
| Android 5.0~5.1 (Lollipop) | 21~22 | L Land | ✅ | ❌ | - |
37-
| Android 4.4~4.4.4 (KitKat) | 19~20 | Dessert Case | ✅ | ❌ | - |
37+
| Android 4.4~4.4W (KitKat) | 19~20 | Dessert Case | ✅ | ❌ | - |
3838
| Android 4.1~4.3 (Jelly Bean) | 16~18 | BeanBag | ✅ | ❌ | - |
39-
| Android 4.0~4.0.4 (Ice Cream Sandwich) | 14~15 | Nyandroid | ✅ | ❌ | - |
39+
| Android 4.0~4.0.3 (Ice Cream Sandwich) | 14~15 | Nyandroid | ✅ | ❌ | - |
4040
| Android 3.0~3.2 (Honeycomb) | 11~13 | Honeycomb [*](#id_egg_name) | ✅ | ❌ | - |
41-
| Android 2.3~2.3.7 (Gingerbread) | 9~10 | Gingerbread [*](#id_egg_name) | ✅ | ❌ | - |
42-
| Android 2.2~2.2.3 (Froyo) | 8 | - | - | - | - |
41+
| Android 2.3~2.3.3 (Gingerbread) | 9~10 | Gingerbread [*](#id_egg_name) | ✅ | ❌ | - |
42+
| Android 2.2 (Froyo) | 8 | - | - | - | - |
4343
| Android 2.0~2.1 (Eclair) | 5~7 | - | - | - | - |
4444
| Android 1.6 (Donut) | 4 | - | - | - | - |
4545
| Android 1.5 (Cupcake) | 3 | - | - | - | - |
4646
| Android 1.1 (Petit Four) | 2 | - | - | - | - |
47-
| Android 1.0 | 1 | - | - | - | - |
47+
| Android 1.0 (Base) | 1 | - | - | - | - |
4848

4949
* <span id='id_new_features'>使用了系统新特性的彩蛋，老版本系统只能使用部分功能。</span>
5050
* <span id='id_full_egg_mini_sdk'>完整体验彩蛋所需要的最低SDK版本。</span>

‎app/build.gradle.kts‎

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,17 @@ plugins {
1212

1313
android {
1414
compileSdk = Versions.COMPILE_SDK
15+
compileSdkPreview = "UpsideDownCake"
1516
buildToolsVersion = Versions.BUILD_TOOLS
1617
namespace = "com.dede.android_eggs"
1718

1819
defaultConfig {
1920
applicationId = "com.dede.android_eggs"
2021
minSdk = Versions.MIN_SDK
2122
targetSdk = Versions.TARGET_SDK
22-
versionCode = 26
23-
versionName = "1.9.3"
23+
// targetSdkPreview = "UpsideDownCake"
24+
versionCode = 27
25+
versionName = "1.9.4"
2426
buildConfigField("String", "GIT_HASH", "\"${gitHash}\"")
2527
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
2628
resourceConfigurations.addAll(listOf("zh", "en"))
@@ -60,11 +62,11 @@ android {
6062
}
6163

6264
compileOptions {
63-
sourceCompatibility = JavaVersion.VERSION_1_8
64-
targetCompatibility = JavaVersion.VERSION_1_8
65+
sourceCompatibility = JavaVersion.VERSION_17
66+
targetCompatibility = JavaVersion.VERSION_17
6567
}
6668
kotlinOptions {
67-
jvmTarget = "1.8"
69+
jvmTarget = "17"
6870
}
6971

7072
testOptions {
@@ -86,16 +88,19 @@ android {
8688

8789
dependencies {
8890
implementation(deps.androidx.appcompat)
89-
implementation(deps.androidx.core.ktx)
90-
implementation(deps.androidx.lifecycle.runtime.ktx)
91-
implementation(deps.androidx.lifecycle.viewmodel.ktx)
92-
implementation(deps.androidx.preference.ktx)
91+
implementation(deps.androidx.core)
92+
implementation(deps.androidx.activity)
93+
implementation(deps.androidx.lifecycle.runtime)
94+
implementation(deps.androidx.lifecycle.viewmodel)
95+
implementation(deps.androidx.preference)
9396
implementation(deps.androidx.constraintlayout)
9497
implementation(deps.androidx.browser)
98+
implementation(deps.androidx.window)
9599
implementation(deps.google.material)
96100
implementation(deps.io.coil)
97101
implementation(deps.free.reflection)
98102
implementation(deps.viewbinding.delegate)
103+
implementation(deps.blurhash.android)
99104
debugImplementation(deps.leakcanary)
100105
implementation(project(":basic"))
101106
implementation(project(":eggs:T"))

‎app/proguard-rules.pro‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
# Uncomment this to preserve the line number information for
1616
# debugging stack traces.
17-
#-keepattributes SourceFile,LineNumberTable
17+
-keepattributes SourceFile,LineNumberTable
1818

1919
# If you keep the line number information, uncomment this to
2020
# hide the original source file name.
@@ -24,6 +24,12 @@
2424
-dontwarn org.conscrypt.**
2525
-dontwarn org.openjsse.**
2626

27+
-keepnames class * extends com.dede.android_eggs.ui.adapter.VHolder
2728
-keepclassmembers class * extends com.dede.android_eggs.ui.adapter.VHolder {
2829
public <init>(android.view.View);
30+
}
31+
32+
# temp fix
33+
-keep class androidx.activity.OnBackPressedDispatcher {
34+
private android.window.OnBackInvokedCallback onBackInvokedCallback;
2935
}

0 commit comments

Comments
 (0)