Skip to content

Commit

Permalink
fix : jitpack build issues
Browse files Browse the repository at this point in the history
	rename old package
  • Loading branch information
jerryOkafor committed Dec 18, 2017
1 parent 9a73a83 commit 0372562
Show file tree
Hide file tree
Showing 14 changed files with 23 additions and 22 deletions.
4 changes: 3 additions & 1 deletion app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,10 @@ dependencies {
compile 'com.android.support.constraint:constraint-layout:1.0.2'

testCompile 'junit:junit:4.12'
compile project(':timelineview')
compile "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"

compile project(':timelineview')
// compile 'com.github.po10cio:TimeLineView:1.0.0'
}
repositories {
mavenCentral()
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/java/me/jerryhanks/stepviewapp/MainActivity.kt
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import android.view.View
import android.widget.FrameLayout
import android.widget.TextView
import kotlinx.android.synthetic.main.activity_main.*
import me.jerryhanks.stepview.IndicatorAdapter
import me.jerryhanks.stepview.interfaces.TimeLineViewCallback
import me.jerryhanks.stepview.model.Status
import me.jerryhanks.timelineview.IndicatorAdapter
import me.jerryhanks.timelineview.interfaces.TimeLineViewCallback
import me.jerryhanks.timelineview.model.Status

class MainActivity : AppCompatActivity() {

Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/me/jerryhanks/stepviewapp/MyTimeLine.kt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package me.jerryhanks.stepviewapp

import me.jerryhanks.stepview.model.Status
import me.jerryhanks.stepview.model.TimeLine
import me.jerryhanks.timelineview.model.Status
import me.jerryhanks.timelineview.model.TimeLine

/**
* @author <@Po10cio> on 10/18/17 for StepViewApp
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout/activity_main.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
app:layout_constraintTop_toTopOf="parent"
tools:text="@string/delivery_status" />

<me.jerryhanks.stepview.TimeLineView
<me.jerryhanks.timelineview.TimeLineView
android:id="@+id/timelineView"
android:layout_width="0dp"
android:layout_height="0dp"
Expand Down
1 change: 1 addition & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ allprojects {
repositories {
jcenter()
google()
maven { url 'https://jitpack.io' }
}
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package me.jerryhanks.stepview;
package me.jerryhanks.timelineview;

import android.content.Context;
import android.support.test.InstrumentationRegistry;
Expand Down
2 changes: 1 addition & 1 deletion timelineview/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"

package="me.jerryhanks.stepview">
package="me.jerryhanks.timelineview">

<application android:allowBackup="true" android:label="@string/app_name"
android:supportsRtl="true">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package me.jerryhanks.stepview
package me.jerryhanks.timelineview

import android.content.Context
import android.support.v4.content.ContextCompat
Expand All @@ -9,11 +9,9 @@ import android.view.View
import android.view.ViewGroup
import android.widget.FrameLayout

import java.util.ArrayList

import me.jerryhanks.stepview.interfaces.TimeLineViewCallback
import me.jerryhanks.stepview.model.Status
import me.jerryhanks.stepview.model.TimeLine
import me.jerryhanks.timelineview.interfaces.TimeLineViewCallback
import me.jerryhanks.timelineview.model.Status
import me.jerryhanks.timelineview.model.TimeLine

class IndicatorAdapter<in T : TimeLine>(private val timeLines: MutableList<T>, private val context: Context, private val _callback: TimeLineViewCallback<T>?) : RecyclerView.Adapter<IndicatorHolder>() {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package me.jerryhanks.stepview
package me.jerryhanks.timelineview

import android.support.v7.widget.RecyclerView
import android.view.View
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package me.jerryhanks.stepview
package me.jerryhanks.timelineview

import android.content.Context
import android.support.v7.widget.LinearLayoutManager
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package me.jerryhanks.stepview.interfaces
package me.jerryhanks.timelineview.interfaces

import android.view.View
import android.widget.FrameLayout

import me.jerryhanks.stepview.model.TimeLine
import me.jerryhanks.timelineview.model.TimeLine

/**
* @author <@Po10cio> on 10/18/17 for StepViewApp
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package me.jerryhanks.stepview.model
package me.jerryhanks.timelineview.model

/**
* @author <@Po10cio> on 10/18/17 for StepViewApp
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package me.jerryhanks.stepview.model
package me.jerryhanks.timelineview.model

/**
* @author <@Po10cio> on 10/18/17 for StepViewApp
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package me.jerryhanks.stepview
package me.jerryhanks.timelineview

import org.junit.Test

Expand Down

0 comments on commit 0372562

Please sign in to comment.