Another package rename to ensure maven is consistent

flowtextview-sample/src/main/AndroidManifest.xml

@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="uk.co.deanwild.flowtext.sample" >
+ package="uk.co.deanwild.flowtextview.sample" >
 
  <application
  android:allowBackup="true"
  android:icon="@drawable/ic_launcher"
  android:label="@string/app_name"
  android:theme="@style/AppTheme" >
  <activity
- android:name="uk.co.deanwild.flowtext.sample.MainActivity"
+ android:name="uk.co.deanwild.flowtextview.sample.MainActivity"
  android:label="FlowTextView Demo" >
  <intent-filter>
  <action android:name="android.intent.action.MAIN" />

flowtextview-sample/src/main/java/uk/co/deanwild/flowtext/sample/MainActivity.java → flowtextview-sample/src/main/java/uk/co/deanwild/flowtextview/sample/MainActivity.java

@@ -1,4 +1,4 @@
-package uk.co.deanwild.flowtext.sample;
+package uk.co.deanwild.flowtextview.sample;
 
 import android.os.Bundle;
 import android.support.v7.app.ActionBarActivity;
@@ -7,7 +7,7 @@
 import android.view.View;
 import android.widget.Button;
 
-import uk.co.deanwild.flowtext.FlowTextView;
+import uk.co.deanwild.flowtextview.FlowTextView;
 
 
 public class MainActivity extends ActionBarActivity implements View.OnClickListener {
@@ -31,8 +31,6 @@ protected void onCreate(Bundle savedInstanceState) {
  btnDecreasefontSize.setOnClickListener(this);
  Button btnReset = (Button) findViewById(R.id.btn_reset);
  btnReset.setOnClickListener(this);
-
-
  }
 
  @Override

flowtextview-sample/src/main/res/layout/activity_main.xml

@@ -12,7 +12,7 @@
  android:layout_width="match_parent"
  android:layout_height="0dip"
  android:layout_weight="1" >
- <uk.co.deanwild.flowtext.FlowTextView
+ <uk.co.deanwild.flowtextview.FlowTextView
  android:id="@+id/ftv"
  android:layout_width="fill_parent"
  android:layout_height="wrap_content" >
@@ -32,7 +32,7 @@
  android:layout_marginTop="400dip"
  android:padding="10dip"
  android:src="@drawable/android2"/>
- </uk.co.deanwild.flowtext.FlowTextView>
+ </uk.co.deanwild.flowtextview.FlowTextView>
  </ScrollView>
  <LinearLayout
  android:layout_width="match_parent"

flowtextview/build.gradle

@@ -1,11 +1,68 @@
 apply plugin: 'android-library'
+apply plugin: 'maven'
+apply plugin: 'signing'
+
+version = "2.0.1"
+group = "uk.co.deanwild"
+
+configurations {
+ archives {
+ extendsFrom configurations.default
+ }
+}
+
+signing {
+ required { has("release") && gradle.taskGraph.hasTask("uploadArchives") }
+ sign configurations.archives
+}
+
+uploadArchives {
+ configuration = configurations.archives
+ repositories.mavenDeployer {
+ beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
+
+ repository(url: "https://oss.sonatype.org/service/local/staging/deploy/maven2") {
+ authentication(userName: "[email protected]",
+ password: "access28")
+ }
+
+ pom.project {
+ name 'Android FlowTextView Library'
+ packaging 'aar'
+ description 'Wrapping TextView for Android'
+ url 'https:/deano2390/FlowTextView'
+
+ scm {
+ url 'scm:[email protected]:deano2390/FlowTextView.git'
+ connection 'scm:[email protected]:deano2390/FlowTextView.git'
+ developerConnection 'scm:[email protected]:deano2390/FlowTextView.git'
+ }
+
+ licenses {
+ license {
+ name 'The Apache Software License, Version 2.0'
+ url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
+ distribution 'repo'
+ }
+ }
+
+ developers {
+ developer {
+ id 'dw'
+ name 'Dean Wild'
+ email '[email protected]'
+ }
+ }
+ }
+ }
+}
 
 android {
  compileSdkVersion 16
  buildToolsVersion "19.1.0"
 
  defaultConfig {
- applicationId "com.pagesuite.coretext"
+ applicationId "uk.co.deanwild.flowtext"
  minSdkVersion 8
  targetSdkVersion 15
  }
@@ -17,3 +74,5 @@ android {
  }
  }
 }
+
+

flowtextview/flowtextview.iml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="FlowTextView" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="uk.co.deanwild" external.system.module.version="2.0.1" type="JAVA_MODULE" version="4">
  <component name="FacetManager">
  <facet type="android-gradle" name="Android-Gradle">
  <configuration>
@@ -59,6 +59,7 @@
  <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
  <excludeFolder url="file://$MODULE_DIR$/build/intermediates" />
  <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
+ <excludeFolder url="file://$MODULE_DIR$/build/poms" />
  <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
  </content>
  <orderEntry type="jdk" jdkName="Android API 16 Platform" jdkType="Android SDK" />

flowtextview/src/main/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="uk.co.deanwild.flowtext.flowtextview"
+ package="uk.co.deanwild.flowtextview.flowtextview"
  android:versionCode="1"
  android:versionName="1.0" >
 

flowtextview/src/main/java/uk/co/deanwild/flowtext/FlowTextView.java → flowtextview/src/main/java/uk/co/deanwild/flowtextview/FlowTextView.java

@@ -1,4 +1,4 @@
-package uk.co.deanwild.flowtext;
+package uk.co.deanwild.flowtextview;
 
 import android.content.Context;
 import android.content.res.Configuration;
@@ -15,15 +15,15 @@
 
 import java.util.ArrayList;
 
-import uk.co.deanwild.flowtext.helpers.ClickHandler;
-import uk.co.deanwild.flowtext.helpers.CollisionHelper;
-import uk.co.deanwild.flowtext.helpers.PaintHelper;
-import uk.co.deanwild.flowtext.helpers.SpanParser;
-import uk.co.deanwild.flowtext.listeners.OnLinkClickListener;
-import uk.co.deanwild.flowtext.models.HtmlLink;
-import uk.co.deanwild.flowtext.models.HtmlObject;
-import uk.co.deanwild.flowtext.models.Line;
-import uk.co.deanwild.flowtext.models.Obstacle;
+import uk.co.deanwild.flowtextview.helpers.ClickHandler;
+import uk.co.deanwild.flowtextview.helpers.CollisionHelper;
+import uk.co.deanwild.flowtextview.helpers.PaintHelper;
+import uk.co.deanwild.flowtextview.helpers.SpanParser;
+import uk.co.deanwild.flowtextview.listeners.OnLinkClickListener;
+import uk.co.deanwild.flowtextview.models.HtmlLink;
+import uk.co.deanwild.flowtextview.models.HtmlObject;
+import uk.co.deanwild.flowtextview.models.Line;
+import uk.co.deanwild.flowtextview.models.Obstacle;
 
 public class FlowTextView extends RelativeLayout {
 

flowtextview/src/main/java/uk/co/deanwild/flowtext/helpers/ClickHandler.java → flowtextview/src/main/java/uk/co/deanwild/flowtextview/helpers/ClickHandler.java

@@ -1,12 +1,12 @@
-package uk.co.deanwild.flowtext.helpers;
+package uk.co.deanwild.flowtextview.helpers;
 
 import android.view.MotionEvent;
 import android.view.View;
 
 import java.util.ArrayList;
 
-import uk.co.deanwild.flowtext.listeners.OnLinkClickListener;
-import uk.co.deanwild.flowtext.models.HtmlLink;
+import uk.co.deanwild.flowtextview.listeners.OnLinkClickListener;
+import uk.co.deanwild.flowtextview.models.HtmlLink;
 
 /**
  * Created by Dean on 24/06/2014.

flowtextview/src/main/java/uk/co/deanwild/flowtext/helpers/CollisionHelper.java → flowtextview/src/main/java/uk/co/deanwild/flowtextview/helpers/CollisionHelper.java

@@ -1,11 +1,11 @@
-package uk.co.deanwild.flowtext.helpers;
+package uk.co.deanwild.flowtextview.helpers;
 
 
 import java.util.ArrayList;
 
-import uk.co.deanwild.flowtext.models.Area;
-import uk.co.deanwild.flowtext.models.Line;
-import uk.co.deanwild.flowtext.models.Obstacle;
+import uk.co.deanwild.flowtextview.models.Area;
+import uk.co.deanwild.flowtextview.models.Line;
+import uk.co.deanwild.flowtextview.models.Obstacle;
 
 /**
  * Created by Dean on 24/06/2014.

flowtextview/src/main/java/uk/co/deanwild/flowtext/helpers/PaintHelper.java → flowtextview/src/main/java/uk/co/deanwild/flowtextview/helpers/PaintHelper.java

@@ -1,4 +1,4 @@
-package uk.co.deanwild.flowtext.helpers;
+package uk.co.deanwild.flowtextview.helpers;
 
 import android.graphics.Paint;
 import android.text.TextPaint;

flowtextview/src/main/java/uk/co/deanwild/flowtext/helpers/SpanParser.java → flowtextview/src/main/java/uk/co/deanwild/flowtextview/helpers/SpanParser.java

@@ -1,4 +1,4 @@
-package uk.co.deanwild.flowtext.helpers;
+package uk.co.deanwild.flowtextview.helpers;
 
 import android.graphics.Typeface;
 import android.text.Spannable;
@@ -10,9 +10,9 @@
 import java.util.Arrays;
 import java.util.HashMap;
 
-import uk.co.deanwild.flowtext.FlowTextView;
-import uk.co.deanwild.flowtext.models.HtmlLink;
-import uk.co.deanwild.flowtext.models.HtmlObject;
+import uk.co.deanwild.flowtextview.FlowTextView;
+import uk.co.deanwild.flowtextview.models.HtmlLink;
+import uk.co.deanwild.flowtextview.models.HtmlObject;
 
 /**
  * Created by Dean on 24/06/2014.

flowtextview/src/main/java/uk/co/deanwild/flowtext/listeners/OnLinkClickListener.java → flowtextview/src/main/java/uk/co/deanwild/flowtextview/listeners/OnLinkClickListener.java

@@ -1,4 +1,4 @@
-package uk.co.deanwild.flowtext.listeners;
+package uk.co.deanwild.flowtextview.listeners;
 
 /**
 * Created by Dean on 24/06/2014.

flowtextview/src/main/java/uk/co/deanwild/flowtext/models/Area.java → flowtextview/src/main/java/uk/co/deanwild/flowtextview/models/Area.java

@@ -1,4 +1,4 @@
-package uk.co.deanwild.flowtext.models;
+package uk.co.deanwild.flowtextview.models;
 
 /**
 * Created by Dean on 24/06/2014.

flowtextview/src/main/java/uk/co/deanwild/flowtext/models/HtmlLink.java → flowtextview/src/main/java/uk/co/deanwild/flowtextview/models/HtmlLink.java

@@ -1,4 +1,4 @@
-package uk.co.deanwild.flowtext.models;
+package uk.co.deanwild.flowtextview.models;
 
 import android.text.TextPaint;
 

flowtextview/src/main/java/uk/co/deanwild/flowtext/models/HtmlObject.java → flowtextview/src/main/java/uk/co/deanwild/flowtextview/models/HtmlObject.java

@@ -1,4 +1,4 @@
-package uk.co.deanwild.flowtext.models;
+package uk.co.deanwild.flowtextview.models;
 
 import android.text.TextPaint;
 

flowtextview/src/main/java/uk/co/deanwild/flowtext/models/Line.java → flowtextview/src/main/java/uk/co/deanwild/flowtextview/models/Line.java

@@ -1,4 +1,4 @@
-package uk.co.deanwild.flowtext.models;
+package uk.co.deanwild.flowtextview.models;
 
 /**
 * Created by Dean on 24/06/2014.

flowtextview/src/main/java/uk/co/deanwild/flowtext/models/Obstacle.java → flowtextview/src/main/java/uk/co/deanwild/flowtextview/models/Obstacle.java

@@ -1,4 +1,4 @@
-package uk.co.deanwild.flowtext.models;
+package uk.co.deanwild.flowtextview.models;
 
 /**
 * Created by Dean on 24/06/2014.