Skip to content

Commit

Permalink
fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
yfdyh000 committed Sep 6, 2021
1 parent 1425051 commit 193453e
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 32 deletions.
2 changes: 0 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@ script:
- "./gradlew :push:assembleRelease --daemon --parallel"
before_install:
- yes | sdkmanager --update
- openssl aes-256-cbc -K $encrypted_66a7d5f7594e_key -iv $encrypted_66a7d5f7594e_iv
-in .yuuta.jks.enc -out .yuuta.jks -d
- chmod +x gradlew
before_deploy:
# Create tag
Expand Down
1 change: 0 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ buildscript {
allprojects {
repositories {
maven { url 'https://jitpack.io' }
maven { url 'https://dl.bintray.com/rikkaw/Libraries' }
google()
jcenter()
}
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-bin.zip
35 changes: 7 additions & 28 deletions push/build.gradle
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
apply plugin: 'com.android.application'
apply plugin: 'kotlin-android'

repositories {
maven { url 'https://dl.bintray.com/heruoxin/icebox' }
allprojects {
repositories {
maven { url 'https://jitpack.io' }
}
}


android {
compileSdkVersion rootProject.ext.compileSdkVersion
buildToolsVersion rootProject.ext.buildToolsVersion
Expand Down Expand Up @@ -42,28 +43,6 @@ android {
}

signingConfigs {
debug {
def locale = null
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())
locale = properties.getProperty("KEY_LOCATE")
keystorePwd = properties.getProperty("KEYSTORE_PASSWORD")
alias = properties.getProperty("KEYSTORE_ALIAS")
pwd = properties.getProperty("KEY_PASSWORD")
}

storeFile file(locale != null ? locale : project.rootProject.file(".yuuta.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")
}
release {
// 满足下面两个条件时需要此配置
// 1. Gradle版本 >= 2.14.1
Expand Down Expand Up @@ -111,7 +90,7 @@ dependencies {
implementation project(':extenders')
implementation "com.android.support:palette-v7:$supportLibraryVersion"

implementation 'com.catchingnow.icebox:SDK:1.0.5'
implementation 'com.github.heruoxin:IceBox-SDK:55dd857d74'

implementation('com.github.AndroidSnippet:SetupWizardLibCompat:0.3', {
exclude group: 'com.android.support'
Expand All @@ -130,10 +109,10 @@ dependencies {
implementation 'moe.shizuku.preference:preference-simplemenu:2.2.3'

// Help
implementation('moe.shizuku.support:helplib:1.1.0', {
implementation('com.github.yfdyh000.RikkaX:helplib:mipush_helplib-SNAPSHOT', {
exclude group: 'moe.shizuku.preference'
exclude group: 'com.android.support'
})
}) // same to moe.shizuku.support:helplib:1.1.0
// RxJava & RxAndroid
implementation("io.reactivex.rxjava2:rxandroid:$rxAndroidVersion", {
exclude group: 'com.android.support'
Expand Down

0 comments on commit 193453e

Please sign in to comment.