Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ version = VERSION_NAME
group = GROUP

android {
compileSdkVersion 21
buildToolsVersion '21.1.2'
compileSdkVersion 23
buildToolsVersion '23.0.3'

defaultConfig {
versionName project.VERSION_NAME
Expand All @@ -22,7 +22,7 @@ android {

dependencies {
compile project(':libraries:layouts')
compile 'com.android.support:recyclerview-v7:23.0.1'
compile 'com.android.support:recyclerview-v7:23.3.0'

testCompile 'junit:junit:4.12'
testCompile 'org.mockito:mockito-core:1.8.5'
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.apmem.tools.example" android:versionCode="1" android:versionName="1.0-SNAPSHOT">
<uses-sdk android:minSdkVersion="15"/>
<uses-sdk android:minSdkVersion="7"/>
<application android:label="@string/app_name" android:icon="@drawable/ic_launcher">
<activity android:name="org.apmem.tools.example.MyActivity" android:label="@string/app_name">
<intent-filter>
Expand Down
8 changes: 4 additions & 4 deletions libraries/layouts/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ version = VERSION_NAME
group = GROUP

android {
compileSdkVersion 21
buildToolsVersion '21.1.2'
compileSdkVersion 23
buildToolsVersion '23.0.3'

defaultConfig {
versionName project.VERSION_NAME
Expand All @@ -21,7 +21,7 @@ android {
}

dependencies {
compile 'com.android.support:recyclerview-v7:23.0.1'
compile 'com.android.support:recyclerview-v7:23.3.0'
}

apply from: 'maven_push.gradle'
//apply from: 'maven_push.gradle'
2 changes: 1 addition & 1 deletion libraries/layouts/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.apmem.tools.layouts">
<uses-sdk android:minSdkVersion="14" android:targetSdkVersion="21"/>
<uses-sdk android:minSdkVersion="7" android:targetSdkVersion="21"/>
</manifest>