Skip to content

Commit

Permalink
update.
Browse files Browse the repository at this point in the history
  • Loading branch information
zhengxiaoyong committed Apr 13, 2018
1 parent 3f47e07 commit a4de497
Show file tree
Hide file tree
Showing 5 changed files with 34 additions and 116 deletions.
16 changes: 8 additions & 8 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 24
buildToolsVersion "24.0.0"
compileSdkVersion 26

defaultConfig {
applicationId "com.zxy.tiny.test"
minSdkVersion 14
targetSdkVersion 24
targetSdkVersion 26
versionCode 1
versionName "1.0"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
Expand All @@ -25,13 +25,13 @@ android {
}

dependencies {
compile fileTree(include: ['*.jar'], dir: 'libs')
implementation fileTree(include: ['*.jar'], dir: 'libs')
androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
exclude group: 'com.android.support', module: 'support-annotations'
})
compile 'com.android.support:appcompat-v7:24.0.0'
implementation 'com.android.support:appcompat-v7:24.0.0'
testCompile 'junit:junit:4.12'
compile project(':tiny')
compile 'com.zxy.android:recovery:0.1.4'
compile 'com.android.support:design:24.0.0'
implementation project(':tiny')
implementation 'com.zxy.android:recovery:0.1.4'
implementation 'com.android.support:design:24.0.0'
}
7 changes: 4 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
buildscript {
repositories {
jcenter()
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:2.2.0'
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7'
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
classpath 'com.android.tools.build:gradle:3.0.1'
classpath 'com.novoda:bintray-release:0.6.1'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
}
Expand All @@ -16,6 +16,7 @@ buildscript {
allprojects {
repositories {
jcenter()
google()
}
}

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-2.14.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
43 changes: 21 additions & 22 deletions tiny/build.gradle
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
apply plugin: 'com.android.library'
apply plugin: 'com.github.dcendents.android-maven'
apply plugin: 'com.jfrog.bintray'
apply plugin: 'com.novoda.bintray-release'

android {
compileSdkVersion 24
buildToolsVersion "24.0.0"
compileSdkVersion 26

defaultConfig {
minSdkVersion 14
targetSdkVersion 24
targetSdkVersion 26
versionCode 1
versionName "1.0"
}
Expand All @@ -29,21 +27,22 @@ dependencies {

}

ext {
upload_group_id = 'com.zxy.android'
upload_version = '0.1.0'

site_url = 'https://github.com/Sunzxyong/Tiny'
git_url = 'https://github.com/Sunzxyong/Tiny.git'
git_issue_url = 'https://github.com/Sunzxyong/Tiny/issues'

bintray_pkg_repo = 'maven'
bintray_pkg_name = 'Tiny'
bintray_pkg_desc = 'an image compression framework.'

developer_id = 'Sunzxyong'
developer_name = 'zhengxiaoyong'
developer_email = '[email protected]'
Properties properties = new Properties()
properties.load(project.rootProject.file('local.properties').newDataInputStream())

publish {
userOrg = 'sunzxyong'
uploadName = 'Tiny'
groupId = 'com.zxy.android'
artifactId = 'tiny'
publishVersion = '0.1.0'
repoName = 'maven'
dryRun = 'false'
desc = 'an image compression framework.'
website = 'https://github.com/Sunzxyong/Tiny'
issueTracker = 'https://github.com/Sunzxyong/Tiny/issues'
repository = 'https://github.com/Sunzxyong/Tiny.git'
bintrayUser = properties.getProperty("bintray.user")
bintrayKey = properties.getProperty("bintray.apikey")
}

apply from: 'publish.gradle'
//./gradlew clean build bintrayUpload -PdryRun=false
82 changes: 0 additions & 82 deletions tiny/publish.gradle

This file was deleted.

0 comments on commit a4de497

Please sign in to comment.