From 6cda600aa2c91eb91bd14f5b31022d378f346fcb Mon Sep 17 00:00:00 2001 From: Sergii Pechenizkyi Date: Fri, 18 Apr 2014 16:25:41 +0300 Subject: [PATCH 1/4] Updated build tools Bumped gradle to 1.11, android plugin to 0.9.+, buildTools to 19.0.3 --- Wink/build.gradle | 2 +- WinkDemo/build.gradle | 2 +- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Wink/build.gradle b/Wink/build.gradle index 7fdeab5..2990e80 100644 --- a/Wink/build.gradle +++ b/Wink/build.gradle @@ -6,7 +6,7 @@ repositories { android { compileSdkVersion 18 - buildToolsVersion "18.1.0" + buildToolsVersion "19.0.3" defaultConfig { minSdkVersion 8 diff --git a/WinkDemo/build.gradle b/WinkDemo/build.gradle index 9a366fb..b52d842 100644 --- a/WinkDemo/build.gradle +++ b/WinkDemo/build.gradle @@ -7,7 +7,7 @@ repositories { android { compileSdkVersion 18 - buildToolsVersion "18.1.0" + buildToolsVersion "19.0.3" defaultConfig { minSdkVersion 8 diff --git a/build.gradle b/build.gradle index bd6967f..920da41 100644 --- a/build.gradle +++ b/build.gradle @@ -4,6 +4,6 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:0.5.+' + classpath 'com.android.tools.build:gradle:0.9.+' } } \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ce067bd..d5e20cb 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=http\://services.gradle.org/distributions/gradle-1.7-all.zip +distributionUrl=http\://services.gradle.org/distributions/gradle-1.11-all.zip From eef853ffa935909d33e89ee2e4aea4731829f6b7 Mon Sep 17 00:00:00 2001 From: Sergii Pechenizkyi Date: Fri, 18 Apr 2014 16:31:43 +0300 Subject: [PATCH 2/4] Target latest SDK and support library Updated to sdk 19 and support lib v19. Deleted support-v4 dependency, since it is included into appcompat-v7 --- Wink/build.gradle | 7 +++---- WinkDemo/build.gradle | 7 +++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/Wink/build.gradle b/Wink/build.gradle index 2990e80..8a96ecd 100644 --- a/Wink/build.gradle +++ b/Wink/build.gradle @@ -5,16 +5,15 @@ repositories { } android { - compileSdkVersion 18 + compileSdkVersion 19 buildToolsVersion "19.0.3" defaultConfig { minSdkVersion 8 - targetSdkVersion 18 + targetSdkVersion 19 } } dependencies { - compile 'com.android.support:appcompat-v7:18.0.0' - compile 'com.android.support:support-v4:18.0.0' + compile 'com.android.support:appcompat-v7:19.1.0' } diff --git a/WinkDemo/build.gradle b/WinkDemo/build.gradle index b52d842..cd03a0d 100644 --- a/WinkDemo/build.gradle +++ b/WinkDemo/build.gradle @@ -6,18 +6,17 @@ repositories { } android { - compileSdkVersion 18 + compileSdkVersion 19 buildToolsVersion "19.0.3" defaultConfig { minSdkVersion 8 - targetSdkVersion 18 + targetSdkVersion 19 } } dependencies { - compile 'com.android.support:appcompat-v7:18.0.0' - compile 'com.android.support:support-v4:18.0.0' + compile 'com.android.support:appcompat-v7:19.1.0' compile 'com.larswerkman:colorpicker:1.0' compile project(':Wink') } From 0f964cfeba99e3ee0cbc576526a7c310e995d96d Mon Sep 17 00:00:00 2001 From: Sergii Pechenizkyi Date: Fri, 18 Apr 2014 16:40:46 +0300 Subject: [PATCH 3/4] Loaded color picker from MavenCentral Color picker dependency was added to maven central, but changed package name. --- WinkDemo/build.gradle | 3 +-- .../codeandmagic/android/wink/FragmentHoloThemeDemo.java | 6 +++--- WinkDemo/src/main/res/layout/fragment_holo_theme_demo.xml | 6 +++--- WinkDemo/src/main/res/layout/fragment_list_demo.xml | 6 +++--- 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/WinkDemo/build.gradle b/WinkDemo/build.gradle index cd03a0d..6eabfb8 100644 --- a/WinkDemo/build.gradle +++ b/WinkDemo/build.gradle @@ -1,7 +1,6 @@ apply plugin: 'android' repositories { - mavenLocal() mavenCentral() } @@ -17,6 +16,6 @@ android { dependencies { compile 'com.android.support:appcompat-v7:19.1.0' - compile 'com.larswerkman:colorpicker:1.0' + compile 'com.larswerkman:HoloColorPicker:1.4' compile project(':Wink') } diff --git a/WinkDemo/src/main/java/org/codeandmagic/android/wink/FragmentHoloThemeDemo.java b/WinkDemo/src/main/java/org/codeandmagic/android/wink/FragmentHoloThemeDemo.java index be9753f..9be1d2d 100644 --- a/WinkDemo/src/main/java/org/codeandmagic/android/wink/FragmentHoloThemeDemo.java +++ b/WinkDemo/src/main/java/org/codeandmagic/android/wink/FragmentHoloThemeDemo.java @@ -10,9 +10,9 @@ import org.codeandmagic.android.wink.support.Wink; -import com.larswerkman.colorpicker.ColorPicker; -import com.larswerkman.colorpicker.OpacityBar; -import com.larswerkman.colorpicker.SVBar; +import com.larswerkman.holocolorpicker.ColorPicker; +import com.larswerkman.holocolorpicker.OpacityBar; +import com.larswerkman.holocolorpicker.SVBar; /** * Created by evelyne24 on 09/10/2013. diff --git a/WinkDemo/src/main/res/layout/fragment_holo_theme_demo.xml b/WinkDemo/src/main/res/layout/fragment_holo_theme_demo.xml index 93f7568..fd73af2 100644 --- a/WinkDemo/src/main/res/layout/fragment_holo_theme_demo.xml +++ b/WinkDemo/src/main/res/layout/fragment_holo_theme_demo.xml @@ -36,20 +36,20 @@ - - - - - - Date: Fri, 18 Apr 2014 16:53:10 +0300 Subject: [PATCH 4/4] Changed package name for demo project The android plugin now enforces that all library dependencies have a unique package name. http://tools.android.com/tech-docs/new-build-system (0.9.1) --- WinkDemo/src/main/AndroidManifest.xml | 2 +- .../android/wink/{ => demo}/ActivityDemo.java | 4 +++- .../wink/{ => demo}/FragmentHoloThemeDemo.java | 11 ++++++++--- .../android/wink/{ => demo}/FragmentListDemo.java | 5 ++++- 4 files changed, 16 insertions(+), 6 deletions(-) rename WinkDemo/src/main/java/org/codeandmagic/android/wink/{ => demo}/ActivityDemo.java (98%) rename WinkDemo/src/main/java/org/codeandmagic/android/wink/{ => demo}/FragmentHoloThemeDemo.java (94%) rename WinkDemo/src/main/java/org/codeandmagic/android/wink/{ => demo}/FragmentListDemo.java (95%) diff --git a/WinkDemo/src/main/AndroidManifest.xml b/WinkDemo/src/main/AndroidManifest.xml index 8c397eb..8eeacfd 100644 --- a/WinkDemo/src/main/AndroidManifest.xml +++ b/WinkDemo/src/main/AndroidManifest.xml @@ -1,6 +1,6 @@ diff --git a/WinkDemo/src/main/java/org/codeandmagic/android/wink/ActivityDemo.java b/WinkDemo/src/main/java/org/codeandmagic/android/wink/demo/ActivityDemo.java similarity index 98% rename from WinkDemo/src/main/java/org/codeandmagic/android/wink/ActivityDemo.java rename to WinkDemo/src/main/java/org/codeandmagic/android/wink/demo/ActivityDemo.java index 41ef671..505ddfa 100644 --- a/WinkDemo/src/main/java/org/codeandmagic/android/wink/ActivityDemo.java +++ b/WinkDemo/src/main/java/org/codeandmagic/android/wink/demo/ActivityDemo.java @@ -1,4 +1,4 @@ -package org.codeandmagic.android.wink; +package org.codeandmagic.android.wink.demo; import android.content.res.Configuration; import android.os.Bundle; @@ -15,6 +15,8 @@ import android.widget.ArrayAdapter; import android.widget.ListView; +import org.codeandmagic.android.wink.demo.R; + public class ActivityDemo extends ActionBarActivity implements AdapterView.OnItemClickListener { private ListView drawerList; diff --git a/WinkDemo/src/main/java/org/codeandmagic/android/wink/FragmentHoloThemeDemo.java b/WinkDemo/src/main/java/org/codeandmagic/android/wink/demo/FragmentHoloThemeDemo.java similarity index 94% rename from WinkDemo/src/main/java/org/codeandmagic/android/wink/FragmentHoloThemeDemo.java rename to WinkDemo/src/main/java/org/codeandmagic/android/wink/demo/FragmentHoloThemeDemo.java index 9be1d2d..3b23410 100644 --- a/WinkDemo/src/main/java/org/codeandmagic/android/wink/FragmentHoloThemeDemo.java +++ b/WinkDemo/src/main/java/org/codeandmagic/android/wink/demo/FragmentHoloThemeDemo.java @@ -1,4 +1,4 @@ -package org.codeandmagic.android.wink; +package org.codeandmagic.android.wink.demo; import android.os.Bundle; import android.support.v4.app.Fragment; @@ -8,12 +8,17 @@ import android.view.ViewGroup; import android.widget.RadioGroup; -import org.codeandmagic.android.wink.support.Wink; - import com.larswerkman.holocolorpicker.ColorPicker; import com.larswerkman.holocolorpicker.OpacityBar; import com.larswerkman.holocolorpicker.SVBar; +import org.codeandmagic.android.wink.IWink; +import org.codeandmagic.android.wink.WinkButtonCallback; +import org.codeandmagic.android.wink.WinkViewCreatedCallback; +import org.codeandmagic.android.wink.demo.R; +import org.codeandmagic.android.wink.support.Wink; + + /** * Created by evelyne24 on 09/10/2013. */ diff --git a/WinkDemo/src/main/java/org/codeandmagic/android/wink/FragmentListDemo.java b/WinkDemo/src/main/java/org/codeandmagic/android/wink/demo/FragmentListDemo.java similarity index 95% rename from WinkDemo/src/main/java/org/codeandmagic/android/wink/FragmentListDemo.java rename to WinkDemo/src/main/java/org/codeandmagic/android/wink/demo/FragmentListDemo.java index 2dd2dd5..be19484 100644 --- a/WinkDemo/src/main/java/org/codeandmagic/android/wink/FragmentListDemo.java +++ b/WinkDemo/src/main/java/org/codeandmagic/android/wink/demo/FragmentListDemo.java @@ -1,4 +1,4 @@ -package org.codeandmagic.android.wink; +package org.codeandmagic.android.wink.demo; import android.os.Bundle; import android.view.LayoutInflater; @@ -10,6 +10,9 @@ import android.widget.ListView; import android.widget.RadioGroup; +import org.codeandmagic.android.wink.IWink; +import org.codeandmagic.android.wink.WinkListCallback; +import org.codeandmagic.android.wink.demo.R; import org.codeandmagic.android.wink.support.Wink; /**