diff --git a/app/build.gradle b/app/build.gradle index bb8f687e6..64a7d3f87 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,29 +1,29 @@ import java.nio.file.Paths -apply plugin: 'com.android.application' +plugins { + id 'com.android.application' +} android { compileSdkVersion 32 buildToolsVersion "32.0.0" + Properties localProperties = new Properties() + if (project.rootProject.file('local.properties').exists()) { + localProperties.load(project.rootProject.file('local.properties').newDataInputStream()) + } + signingConfigs { - def keystorePwd = null - def alias = null - def pwd = null - if (project.rootProject.file('local.properties').exists()) { - Properties properties = new Properties() - properties.load(project.rootProject.file('local.properties').newDataInputStream()) - keystorePwd = properties.getProperty("RELEASE_STORE_PASSWORD") - alias = properties.getProperty("RELEASE_KEY_ALIAS") - pwd = properties.getProperty("RELEASE_KEY_PASSWORD") - } - release { - storeFile file("hitokoto.jks") - storePassword keystorePwd != null ? keystorePwd : System.getenv("KEYSTORE_PASS") - keyAlias alias != null ? alias : System.getenv("ALIAS_NAME") - keyPassword pwd != null ? pwd : System.getenv("ALIAS_PASS") + if (localProperties.getProperty("storeFile") != null) { + sign { + storeFile file(localProperties.getProperty("storeFile")) + storePassword localProperties.getProperty("storePassword") + keyAlias localProperties.getProperty("keyAlias") + keyPassword localProperties.getProperty("keyPassword") + } } } + defaultConfig { applicationId "io.github.nekoinverter.ehviewer" minSdkVersion 23 @@ -49,7 +49,8 @@ android { resources { excludes += "/META-INF/**" excludes += "/kotlin/**" - excludes += "/*.txt" + excludes += "**.txt" + excludes += "**.bin" } } @@ -60,11 +61,17 @@ android { minifyEnabled true shrinkResources true proguardFiles 'proguard-rules.pro' - signingConfig signingConfigs.release + if (localProperties.getProperty("storeFile") != null) { + signingConfig signingConfigs.sign + } } debug { applicationIdSuffix ".debug" - signingConfig signingConfigs.release + if (localProperties.getProperty("storeFile") != null) { + signingConfig signingConfigs.sign + } else { + signingConfig signingConfigs.debug + } } } @@ -107,19 +114,17 @@ tasks.whenTaskAdded { task -> } dependencies { - implementation fileTree(include: ['*.jar'], dir: 'libs') implementation 'androidx.activity:activity:1.4.0' implementation 'androidx.biometric:biometric:1.1.0' implementation 'androidx.browser:browser:1.4.0' implementation 'androidx.cardview:cardview:1.0.0' implementation 'androidx.core:core:1.7.0' implementation 'androidx.dynamicanimation:dynamicanimation:1.1.0-alpha03' - implementation 'androidx.fragment:fragment:1.4.0' - implementation 'androidx.preference:preference:1.1.1' + implementation 'androidx.fragment:fragment:1.4.1' + implementation 'androidx.preference:preference:1.2.0' implementation 'androidx.recyclerview:recyclerview:1.2.1' implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.2.0-alpha01' implementation 'androidx.webkit:webkit:1.4.0' - implementation 'com.android.tools.build:apksig:7.0.4' implementation 'com.drakeet.drawer:drawer:1.0.3' implementation 'com.google.android.material:material:1.5.0' implementation 'com.getkeepsafe.relinker:relinker:1.4.4' @@ -134,16 +139,16 @@ dependencies { implementation 'com.github.seven332:yorozuya-thread:0.1.1' implementation 'com.github.seven332:yorozuya-collect:0.1.4' implementation 'com.h6ah4i.android.widget.advrecyclerview:advrecyclerview:1.0.0' - implementation 'com.microsoft.appcenter:appcenter-analytics:4.4.2' - implementation 'com.microsoft.appcenter:appcenter-crashes:4.4.2' - implementation 'com.microsoft.appcenter:appcenter-distribute:4.4.2' + implementation 'com.microsoft.appcenter:appcenter-analytics:4.4.3' + implementation 'com.microsoft.appcenter:appcenter-crashes:4.4.3' + implementation 'com.microsoft.appcenter:appcenter-distribute:4.4.3' implementation 'com.squareup.okhttp3:okhttp:4.9.2' implementation 'com.squareup.okhttp3:okhttp-dnsoverhttps:4.9.2' implementation 'com.takisoft.preferencex:preferencex:1.1.0' implementation 'com.gitlab.NekoInverter:yorozuya:723dc867a9' implementation 'dev.rikka.rikkax.appcompat:appcompat:1.4.1' - implementation 'dev.rikka.rikkax.core:core:1.3.3' - implementation 'dev.rikka.rikkax.insets:insets:1.1.1' + implementation 'dev.rikka.rikkax.core:core:1.3.4' + implementation 'dev.rikka.rikkax.insets:insets:1.2.0' implementation 'dev.rikka.rikkax.layoutinflater:layoutinflater:1.2.0' implementation 'dev.rikka.rikkax.material:material:1.6.6' implementation 'dev.rikka.rikkax.recyclerview:recyclerview-ktx:1.3.1' @@ -152,7 +157,7 @@ dependencies { implementation 'org.ccil.cowan.tagsoup:tagsoup:1.2.1' implementation 'org.greenrobot:greendao:3.3.0' implementation 'org.jsoup:jsoup:1.14.3' - implementation project(':native') + implementation projects.native testImplementation 'junit:junit:4.12' testImplementation 'org.robolectric:robolectric:4.2.1' testImplementation 'org.jooq:joor:0.9.6' diff --git a/app/hitokoto.jks b/app/hitokoto.jks deleted file mode 100644 index f5028dcae..000000000 Binary files a/app/hitokoto.jks and /dev/null differ diff --git a/build.gradle b/build.gradle index 7ab3452b0..2fc83d324 100644 --- a/build.gradle +++ b/build.gradle @@ -1,27 +1,7 @@ -// Top-level build file where you can add configuration options common to all sub-projects/modules. - -buildscript { - repositories { - google() - mavenCentral() - } - dependencies { - classpath 'com.android.tools.build:gradle:7.1.0' - - // NOTE: Do not place your application dependencies here; they belong - // in the individual module build.gradle files - } -} - -allprojects { - repositories { - google() - mavenCentral() - maven { url "https://jcenter.bintray.com" } - maven { url "https://jitpack.io" } - } +plugins { + id 'com.android.application' version '7.1.2' apply false } task clean(type: Delete) { delete rootProject.buildDir -} +} \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 7454180f2..41d9927a4 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 2e6e5897b..00e33edef 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/settings.gradle b/settings.gradle index ef792ec4f..fa04b77a0 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1,19 @@ +pluginManagement { + repositories { + gradlePluginPortal() + google() + mavenCentral() + } +} +dependencyResolutionManagement { + repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) + repositories { + google() + mavenCentral() + maven { url "https://jcenter.bintray.com" } + maven { url "https://jitpack.io" } + } +} +enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS") +rootProject.name = "EhViewer" include ':app', ':daogenerator', ':native'