Skip to content

Commit eeb3735

Browse files
committed
v1.5.0
新增 1. 适配最新网址
1 parent 5285922 commit eeb3735

Some content is hidden

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

45 files changed

+231
-146
lines changed

.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/dictionaries/default_user.xml

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

.idea/gradle.xml

Lines changed: 2 additions & 3 deletions
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/migrations.xml

Lines changed: 10 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 & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
/build
2-
/release
2+
/release
3+
/debug
4+
/signing.properties

app/build.gradle

Lines changed: 62 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,58 @@
1-
apply plugin: 'com.android.application'
2-
apply plugin: 'kotlin-android'
3-
apply plugin: 'kotlin-android-extensions'
1+
plugins {
2+
id 'com.android.application'
3+
id 'kotlin-android'
4+
id 'kotlin-android-extensions'
5+
id 'kotlin-kapt'
6+
}
47

58
android {
6-
compileSdkVersion 32
7-
buildToolsVersion "30.0.2"
8-
99
defaultConfig {
10-
applicationId "top.fumiama.copymanga"
10+
compileSdk 34
11+
applicationId "top.fumiama.copymangaweb"
1112
minSdkVersion 23
12-
targetSdkVersion 32
13-
versionCode 12
14-
versionName '1.4.3'
13+
//noinspection OldTargetApi
14+
targetSdkVersion 34
15+
versionCode 13
16+
versionName '1.5.0'
1517
resConfigs "zh", "zh-rCN"
1618

1719
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1820
}
1921

2022
signingConfigs {
2123
release {
22-
storeFile file('../../../OneDrive/swc/developer/android_key/open_key')
23-
storePassword 'fumiama'
24-
keyAlias 'default'
25-
keyPassword 'fumiama'
26-
v1SigningEnabled true
27-
v2SigningEnabled true
24+
enableV1Signing true
25+
enableV2Signing true
26+
enableV3Signing true
27+
enableV4Signing true
28+
}
29+
debug {
30+
enableV1Signing true
31+
enableV2Signing true
32+
enableV3Signing true
33+
enableV4Signing true
2834
}
2935
}
30-
3136
buildTypes {
3237
release {
3338
minifyEnabled true
3439
shrinkResources true
40+
vcsInfo.include false
3541
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
3642
signingConfig signingConfigs.release
3743
}
38-
/*debug{
44+
/*winrelease {r
3945
minifyEnabled true
4046
shrinkResources true
4147
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
4248
}*/
49+
debug{
50+
//minifyEnabled true
51+
//shrinkResources true
52+
//vcsInfo.include false
53+
//proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
54+
signingConfig signingConfigs.debug
55+
}
4356
}
4457

4558
compileOptions {
@@ -54,19 +67,43 @@ android {
5467
viewBinding {
5568
enabled = true
5669
}
70+
bundle{
71+
density{
72+
enableSplit = true
73+
}
74+
language{
75+
enableSplit = false
76+
}
77+
}
78+
namespace 'top.fumiama.copymangaweb'
79+
}
80+
81+
Properties props = new Properties()
82+
def propFile = file('signing.properties')
83+
if (propFile.canRead()){
84+
props.load(new FileInputStream(propFile))
85+
86+
if (props!=null && props.containsKey('STORE_FILE') && props.containsKey('STORE_PASSWORD') &&
87+
props.containsKey('KEY_ALIAS') && props.containsKey('KEY_PASSWORD')) {
88+
89+
android.signingConfigs.debug.storeFile = file(props['STORE_FILE'])
90+
android.signingConfigs.debug.storePassword = props['STORE_PASSWORD']
91+
android.signingConfigs.debug.keyAlias = props['KEY_ALIAS']
92+
android.signingConfigs.debug.keyPassword = props['KEY_PASSWORD']
93+
}
5794
}
5895

5996
dependencies {
6097
implementation fileTree(dir: "libs", include: ["*.jar"])
6198
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
6299
implementation 'androidx.core:core-ktx:1.8.0'
63-
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
100+
implementation 'androidx.constraintlayout:constraintlayout:2.2.1'
64101
implementation 'androidx.cardview:cardview:1.0.0'
65-
implementation 'androidx.viewpager2:viewpager2:1.0.0'
102+
implementation 'androidx.viewpager2:viewpager2:1.1.0'
66103
testImplementation 'junit:junit:4.13.2'
67-
androidTestImplementation 'androidx.test.ext:junit:1.1.3'
68-
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
69-
implementation 'com.github.bumptech.glide:glide:4.12.0'
70-
annotationProcessor 'com.github.bumptech.glide:compiler:4.12.0'
71-
implementation 'com.google.code.gson:gson:2.8.9'
104+
androidTestImplementation 'androidx.test.ext:junit:1.2.1'
105+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
106+
implementation 'com.github.bumptech.glide:glide:4.16.0'
107+
annotationProcessor 'com.github.bumptech.glide:compiler:4.16.0'
108+
implementation 'com.google.code.gson:gson:2.13.1'
72109
}

app/proguard-rules.pro

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
#-keep class com.google.gson.stream.** { *; }
4545

4646
# Application classes that will be serialized/deserialized over Gson
47-
-keep public class top.fumiama.copymanga.data.* { *; }
47+
-keep public class top.fumiama.copymangaweb.data.* { *; }
4848

4949
# Prevent proguard from stripping interface information from TypeAdapter, TypeAdapterFactory,
5050
# JsonSerializer, JsonDeserializer instances (so they can be used in @JsonAdapter)

app/src/androidTest/java/top/fumiama/copymanga/ExampleInstrumentedTest.kt renamed to app/src/androidTest/java/top/fumiama/copymangaweb/ExampleInstrumentedTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package top.fumiama.copymanga
1+
package top.fumiama.copymangaweb
22

33
import androidx.test.platform.app.InstrumentationRegistry
44
import androidx.test.ext.junit.runners.AndroidJUnit4

0 commit comments

Comments
 (0)