Skip to content

Commit

Permalink
Action:release v1.0.1
Browse files Browse the repository at this point in the history
Description:发布版本v1.0.1
  • Loading branch information
yj committed Jun 29, 2017
1 parent 60ba97c commit 23ee8bd
Show file tree
Hide file tree
Showing 10 changed files with 140 additions and 85 deletions.
2 changes: 1 addition & 1 deletion .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 4 additions & 1 deletion README-CN.md
Expand Up @@ -3,7 +3,7 @@
一个支持左右滑动并带有视差滑动效果的安卓滑动菜单控件。
[![Platform](https://img.shields.io/badge/platform-android-green.svg)](http://developer.android.com/index.html)
<img src="https://img.shields.io/badge/license-Apache 2.0-green.svg?style=flat">
[![API](https://img.shields.io/badge/API-12%2B-green.svg?style=flat)](https://android-arsenal.com/api?level=11)
[![SDK](https://img.shields.io/badge/API-12%2B-green.svg?style=flat)](https://android-arsenal.com/api?level=11)

## 演示
封装不同场景下的滑动嵌套
Expand All @@ -13,6 +13,7 @@
- [x] **支持滑动方向的配置**
- [x] **直接作为控件使用**
- [x] **处理各个场景下的滑动冲突**

## 最新版本
模块|slideMenuLayout
---|---
Expand Down Expand Up @@ -84,6 +85,8 @@ compile 'com.justkiddingbaby:slidemenu:最新版本'
要是slideMode为both时,则SlideMenuLayout必须要有三个子视图,否则会抛出异常。

## 发布历史
#### v1.0.1(2017/6/9)
1、修改最低版本SDK为12.
#### v1.0.0(2017/6/8)
1、发布SlideMenuLayout,处理各个场景下的滑动冲突。
2、封装demo。
7 changes: 5 additions & 2 deletions README.md
Expand Up @@ -4,7 +4,7 @@ An android slide menu that supports left and right swipes and slides with parall
一个支持左右滑动并带有视差滑动效果的安卓滑动菜单控件。([中文版入口](README-CN.md))
[![Platform](https://img.shields.io/badge/platform-android-green.svg)](http://developer.android.com/index.html)
<img src="https://img.shields.io/badge/license-Apache 2.0-green.svg?style=flat">
[![API](https://img.shields.io/badge/API-12%2B-green.svg?style=flat)](https://android-arsenal.com/api?level=11)
[![SDK](https://img.shields.io/badge/API-12%2B-green.svg?style=flat)](https://android-arsenal.com/api?level=11)

## Demo
Encapsulate the sliding nesting of different scenarios.
Expand All @@ -14,6 +14,7 @@ Encapsulate the sliding nesting of different scenarios.
- [x] **support for sliding direction configuration**
- [x] **it can be used as view**
- [x] **Handle the sliding conflicts in each scenarios**

## Version
name|SlideMenuLayout
---|---
Expand Down Expand Up @@ -84,7 +85,9 @@ return|function name|instruction
**when you use [SlideMenuLayout](/slidemenu/src/main/java/com/jkb/slidemenu/SlideMenuLayout.java) in layout,it can only host three child view,and the left slide menu view and the right slide menu view must add before the content view (for prevent the right slide menu from overlapping).**
if slideMode is both then the SlideViewLayout must host three child views.

## Release history
## Release history\
#### v1.0.1(2017/6/29)
1、alter minSdkVersion to SDK 12.
#### v1.0.0(2017/6/8)
1、release SlideMenuLayout,Handle the sliding conflicts in each scenarios.
2、Encapsulation demo.
67 changes: 28 additions & 39 deletions app/build.gradle
@@ -1,67 +1,56 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion rootProject.ext.compileSdkVersion
buildToolsVersion rootProject.ext.buildToolsVersion
def appVerCode = 1
def appVerName = "0.0.1"

compileSdkVersion rootProject.ext.android.compileSdkVersion
buildToolsVersion rootProject.ext.android.buildToolsVersion

defaultConfig {
applicationId "com.jkb.slidemenulayout"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode appVerCode
versionName appVerName + "-${releaseTime()}"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
applicationId rootProject.ext.app.applicationId
minSdkVersion rootProject.ext.android.minSdkVersion
targetSdkVersion rootProject.ext.android.targetSdkVersion
versionCode rootProject.ext.app.versionCode
versionName rootProject.ext.app.versionName
}

compileOptions {
sourceCompatibility rootProject.ext.sourceCompatibilityVersion
targetCompatibility rootProject.ext.targetCompatibilityVersion
sourceCompatibility rootProject.ext.android.sourceCompatibilityVersion
targetCompatibility rootProject.ext.android.targetCompatibilityVersion
}

signingConfigs {
debug {
storeFile file(STORE_FILE)
storePassword STORE_PASSWORD
keyAlias KEY_ALIAS
keyPassword KEY_PASSWORD
v2SigningEnabled false
}
release {
storeFile file(STORE_FILE)
storePassword STORE_PASSWORD
keyAlias KEY_ALIAS
keyPassword KEY_PASSWORD
myConfig {
storeFile file(rootProject.ext.store.storeKey)
storePassword rootProject.ext.store.storePassword
keyAlias rootProject.ext.store.keyAlias
keyPassword rootProject.ext.store.keyPassword
v2SigningEnabled false
}
}

buildTypes {
release {
minifyEnabled false //混淆编译
shrinkResources false //移除无用的资源文件
zipAlignEnabled true //是否启用zipAlign压缩
signingConfig signingConfigs.release
minifyEnabled true
//是否清理无用资源
shrinkResources true
//是否启用zipAlign压缩
zipAlignEnabled true
signingConfig signingConfigs.myConfig
versionNameSuffix rootProject.ext.app.versionNameSuffix
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
debug {
minifyEnabled false
zipAlignEnabled false
shrinkResources false
signingConfig signingConfigs.debug
signingConfig signingConfigs.myConfig
versionNameSuffix rootProject.ext.app.versionNameSuffix
}
}

lintOptions {
abortOnError false
}
}

dependencies {
compile 'com.android.support:design:25.3.1'
compile 'com.android.support:appcompat-v7:25.3.1'
compile project(':slidemenu')
compile rootProject.ext.dependencies.design
compile project(":slidemenu")
}

def static releaseTime() {
return new Date().format("yyyyMMdd", TimeZone.getTimeZone("GMT+8"))
}
3 changes: 0 additions & 3 deletions app/src/main/AndroidManifest.xml
Expand Up @@ -3,11 +3,8 @@
package="com.jkb.slidemenulayout">

<application
android:allowBackup="true"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/AppTheme">
<activity android:name=".MainActivity">
<intent-filter>
Expand Down
11 changes: 2 additions & 9 deletions build.gradle
@@ -1,5 +1,7 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.

apply from: "config.gradle"

buildscript {
repositories {
jcenter()
Expand All @@ -25,15 +27,6 @@ allprojects {
}
}

ext {
minSdkVersion = 15
targetSdkVersion = 25
compileSdkVersion = 25
buildToolsVersion = "25.0.2"
sourceCompatibilityVersion = JavaVersion.VERSION_1_7
targetCompatibilityVersion = JavaVersion.VERSION_1_7
}

task clean(type: Delete) {
delete rootProject.buildDir
}
75 changes: 75 additions & 0 deletions config.gradle
@@ -0,0 +1,75 @@
import java.util.regex.Matcher
import java.util.regex.Pattern

ext {
app = [
appVerCode : 1,
appVerName : "0.0.1" + "-${releaseTime()}",
applicationId : "com.jkb.supportfragment.demo",
versionNameSuffix: getCurrentVersionSuffix(),
minSdkVersion : 14
]

slidemenu = [
publishCode : 2,
publishVersion: "1.0.1",

userOrg : 'jkb',
groupId : 'com.justkiddingbaby',
artifactId : 'slidemenu',
desc : 'An Android slide menu layout that support left slide and right slide.',
website : 'https://github.com/YangJing96/SlideMenuLayout'
]

android = [
minSdkVersion : 12,
targetSdkVersion : 23,
compileSdkVersion : 23,
buildToolsVersion : "25.0.0",
sourceCompatibilityVersion: JavaVersion.VERSION_1_7,
targetCompatibilityVersion: JavaVersion.VERSION_1_7
]

dependencies = [
appcompatV7: 'com.android.support:appcompat-v7:23.0.1',
design : 'com.android.support:design:24.0.0',
]

store = [
storeKey : '../sign/JustKiddingBaby.jks',
storePassword: 'mimajiushiwo',
keyAlias : 'JustKiddingBaby',
keyPassword : 'mimajiushiwo'
]
}

def static releaseTime() {
return new Date().format("yyyyMMdd", TimeZone.getTimeZone("GMT+8"))
}

def getCurrentVersionSuffix() {
def currentFlavor = getCurrentFlavor()
if (currentFlavor == "prod") {
return "-prod"
} else if (currentFlavor == "uat") {
return "-uat"
} else if (currentFlavor == "dev") {
return "-dev"
}
}

def getCurrentFlavor() {
String taskRequestName = getGradle().getStartParameter().getTaskRequests().toString()
Pattern pattern;
if (taskRequestName.contains("assemble")) {
pattern = Pattern.compile("assemble(\\w+)(Release|Debug)")
} else {
pattern = Pattern.compile("generate(\\w+)(Release|Debug)")
}
Matcher matcher = pattern.matcher(taskRequestName)
if (matcher.find()) {
return matcher.group(1).toLowerCase()
} else {
return "";
}
}
13 changes: 1 addition & 12 deletions gradle.properties
Expand Up @@ -14,15 +14,4 @@ org.gradle.jvmargs=-Xmx1536m
# When configured, Gradle will run in incubating parallel mode.
# This option should only be used with decoupled projects. More details, visit
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
# org.gradle.parallel=true

STORE_FILE=../sign/JustKiddingBaby.jks
STORE_PASSWORD=mimajiushiwo
KEY_ALIAS=JustKiddingBaby
KEY_PASSWORD=mimajiushiwo

COMPILE_SDK_VERSION=23
BUILDTOOLS_VERSION=25.0.2
SUPPORT_LIB_VERSION=23.0.0
MIN_SDK_VERSION=12
TARGET_SDK_VERSION=23
# org.gradle.parallel=true
36 changes: 21 additions & 15 deletions slidemenu/build.gradle
@@ -1,39 +1,45 @@
apply plugin: 'com.android.library'
apply plugin: 'com.novoda.bintray-release'

def appVerCode = 1
def appVerName = "1.0.0"

publish {
userOrg = 'jkb'
groupId = 'com.justkiddingbaby'
artifactId = 'slidemenu'
publishVersion = appVerName
desc = 'An Android slide menu layout that support left slide and right slide.'
website = 'https://github.com/YangJing96/SlideMenuLayout'
userOrg = rootProject.ext.slidemenu.userOrg
groupId = rootProject.ext.slidemenu.groupId
artifactId = rootProject.ext.slidemenu.artifactId
publishVersion = rootProject.ext.slidemenu.publishVersion
desc = rootProject.ext.slidemenu.desc
website = rootProject.ext.slidemenu.website
}

android {
compileSdkVersion Integer.parseInt(COMPILE_SDK_VERSION)
buildToolsVersion BUILDTOOLS_VERSION

compileSdkVersion rootProject.ext.android.compileSdkVersion
buildToolsVersion rootProject.ext.android.buildToolsVersion

defaultConfig {
minSdkVersion Integer.parseInt(MIN_SDK_VERSION)
targetSdkVersion Integer.parseInt(TARGET_SDK_VERSION)
versionCode appVerCode
versionName appVerName
minSdkVersion rootProject.ext.android.minSdkVersion
targetSdkVersion rootProject.ext.android.targetSdkVersion
versionCode rootProject.ext.slidemenu.publishCode
versionName rootProject.ext.slidemenu.publishVersion
}

compileOptions {
sourceCompatibility rootProject.ext.android.sourceCompatibilityVersion
targetCompatibility rootProject.ext.android.targetCompatibilityVersion
}

buildTypes {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}

lintOptions {
abortOnError false
}
}

dependencies {
compile "com.android.support:appcompat-v7:${SUPPORT_LIB_VERSION}"
compile rootProject.ext.dependencies.appcompatV7
}
6 changes: 3 additions & 3 deletions slidemenu/src/main/AndroidManifest.xml
@@ -1,9 +1,9 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"

package="com.jkb.slidemenu">
package="com.jkb.slidemenu">

<application android:allowBackup="true" android:label="@string/app_name"
android:supportsRtl="true">
<application
android:label="@string/app_name">

</application>

Expand Down

0 comments on commit 23ee8bd

Please sign in to comment.