Updaeted IcePick to version 3.0.2

arkangelx · Apr 3, 2015 · 80ce3da · 80ce3da
1 parent 0b587aa
commit 80ce3da
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 27 deletions.
diff --git a/build.gradle b/build.gradle
@@ -17,6 +17,10 @@ allprojects {
     maven{
       url 'https://oss.sonatype.org/content/repositories/snapshots/'
     }
+
+    maven {
+      url 'https://clojars.org/repo/'
+    }
   }
 }
 
@@ -28,11 +32,11 @@ ext {
   compileSdkVersion = 22
 
   // Libraries
-  appcompat7Version = '22.0.+'
-  recyclerviewVersion = '21.0.+'
+  appcompat7Version = '22.0.0'
+  recyclerviewVersion = '22.0.0'
   fragmentargsVersion = '2.0.1'
   butterknifeVersion = '6.1.0'
-  icepickVersion = '2.3.6'
+  icepickVersion = '3.0.2'
 
   // Test Libs
   robolectricVersion = '2.4'

diff --git a/core/build.gradle b/core/build.gradle
@@ -22,7 +22,7 @@ android {
 dependencies {
 
   compile 'com.android.support:appcompat-v7:'+rootProject.ext.appcompat7Version
-  compile 'com.github.frankiesardo:icepick:'+rootProject.ext.icepickVersion
+  compile 'frankiesardo:icepick:'+rootProject.ext.icepickVersion
   compile 'com.jakewharton:butterknife:'+rootProject.ext.butterknifeVersion
   compile 'com.hannesdorfmann.fragmentargs:annotation:'+rootProject.ext.fragmentargsVersion
 

diff --git a/core/src/androidTest/java/com/hannesdorfmann/mosby/ApplicationTest.java b/core/src/androidTest/java/com/hannesdorfmann/mosby/ApplicationTest.java
diff --git a/gradle.properties b/gradle.properties
@@ -17,7 +17,7 @@
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
 
-VERSION_NAME=0.9.1-SNAPSHOT
+VERSION_NAME=0.9.3-ICEPICK-SNAPSHOT
 VERSION_CODE=10
 GROUP=com.hannesdorfmann.mosby
 

diff --git a/maven-push.gradle b/maven-push.gradle
@@ -22,13 +22,13 @@ def isReleaseBuild() {
 }
 
 def getReleaseRepositoryUrl() {
-  return hasProperty('RELEASE_REPOSITORY_URL') ? RELEASE_REPOSITORY_URL
-      : "https://oss.sonatype.org/service/local/staging/deploy/maven2/"
+  return hasProperty('RELEASE_REPOSITORY_URL') ? RELEASE_REPOSITORY_URL :
+      "https://oss.sonatype.org/service/local/staging/deploy/maven2/"
 }
 
 def getSnapshotRepositoryUrl() {
-  return hasProperty('SNAPSHOT_REPOSITORY_URL') ? SNAPSHOT_REPOSITORY_URL
-      : "https://oss.sonatype.org/content/repositories/snapshots/"
+  return hasProperty('SNAPSHOT_REPOSITORY_URL') ? SNAPSHOT_REPOSITORY_URL :
+      "https://oss.sonatype.org/content/repositories/snapshots/"
 }
 
 def getRepositoryUsername() {
@@ -39,11 +39,21 @@ def getRepositoryPassword() {
   return hasProperty('NEXUS_PASSWORD') ? NEXUS_PASSWORD : ""
 }
 
+
 afterEvaluate { project ->
   uploadArchives {
     repositories {
       mavenDeployer {
         beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
+/*
+        pom.withXml {
+          asNode().children().first().parent()
+              .appendNode('repositories')
+                .appendNode('repository')
+                  .appendNode('id', 'clojars').parent()
+                  .appendNode('url', 'https://clojars.org/repo/')
+        }
+*/
 
         pom.groupId = GROUP
         pom.artifactId = POM_ARTIFACT_ID

diff --git a/sample/src/main/java/com/hannesdorfmann/mosby/sample/MainActivity.java b/sample/src/main/java/com/hannesdorfmann/mosby/sample/MainActivity.java
@@ -44,16 +44,16 @@ public class MainActivity extends MosbyActivity implements AdapterView.OnItemCli
 
   private Demo[] createDemos() {
     return new Demo[] {
-        new Demo("MvpLcsActivity", new Intent(this, CountriesActivity.class)),
-        new Demo("MvpLcsFragment",
+        new Demo("MvpLceActivity", new Intent(this, CountriesActivity.class)),
+        new Demo("MvpLceFragment",
             new Intent(this, FragmentContainerActivity.class).putExtra("fragment",
-                "CountriesFragment")), new Demo("RetainingViewsStateFragment",
+                "CountriesFragment")), new Demo("RetainingViewsState LceFragment",
         new Intent(this, FragmentContainerActivity.class).putExtra("fragment",
             "RetainingCountriesFragment")),
-        new Demo("Retaining by using Parcelable ViewsStateFragment",
+        new Demo("Retaining by using Parcelable ViewsState LceFragment",
             new Intent(this, FragmentContainerActivity.class).putExtra("fragment",
                 "NotRetainingCountriesFragment")),
-        new Demo("LCE Activity + ViewsState", new Intent(this, CountriesViewStateActivity.class)),
+        new Demo("ViewsState LceActivity", new Intent(this, CountriesViewStateActivity.class)),
         new Demo("Custom ViewsState Fragment",
             new Intent(this, FragmentContainerActivity.class).putExtra("fragment",
                 "CustomViewStateFragment")),