Skip to content

Commit

Permalink
Merge pull request #8 from MaximeJallu/fix_doublon
Browse files Browse the repository at this point in the history
feat(adapter): remove kotlin
  • Loading branch information
MaximeJallu authored Sep 29, 2017
2 parents d528567 + 9a0559d commit 9439131
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 240 deletions.
8 changes: 4 additions & 4 deletions adapter/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ android {
// applicationId "com.android.jmaxime.com.android.jmaxime.adapter"
minSdkVersion 23
targetSdkVersion 26
versionCode 1710291355 /*YYMMDDHHMM*/
versionName "1.1"
versionCode 1710291743 /*YYMMDDHHMM*/
versionName "1.2"

testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"

Expand Down Expand Up @@ -57,11 +57,11 @@ dependencies {
exclude group: 'com.android.support', module: 'support-annotations'
})

compile "org.jetbrains.kotlin:kotlin-stdlib:1.1.50"
// compile "org.jetbrains.kotlin:kotlin-stdlib:1.1.50"
compile "com.android.support:appcompat-v7:$androidSupport"
compile "com.android.support:design:$androidSupport"
compile 'com.squareup.picasso:picasso:2.5.2'
compile 'com.squareup.retrofit2:adapter-rxjava:2.3.0'
// compile 'com.squareup.retrofit2:adapter-rxjava:2.3.0'
compile 'com.jakewharton:butterknife:8.8.1'
annotationProcessor 'com.jakewharton:butterknife-compiler:8.8.1'
}
226 changes: 0 additions & 226 deletions adapter/src/main/java/com/android/jmaxime/adapter/RecyclerAdapter.java

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.android.jmaxime.adapter;
package com.android.jmaxime.adapters;

import android.support.annotation.LayoutRes;
import android.support.annotation.NonNull;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,6 @@
import java.util.ArrayList;
import java.util.List;

/**
* @author Maxime Jallu
* @since 03/05/2017
* <p>
* Create for CubeInStore - Android (Decathlon)
* <p>
* Use this Class for : <br/>
* ... {DOCUMENTATION}
*/
public class RecyclerAdapter<T> extends RecyclerView.Adapter<RecyclerViewHolder<T>> {

private List<T> mTList;
Expand Down

0 comments on commit 9439131

Please sign in to comment.