diff --git a/.gitignore b/.gitignore index 39fb081..55a038f 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,8 @@ /local.properties /.idea/workspace.xml /.idea/libraries +/.idea/codeStyles/Project.xml +/.idea/vcs.xml .DS_Store /build /captures diff --git a/app/build.gradle b/app/build.gradle index 17a0186..b29d745 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,8 +1,8 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 26 - buildToolsVersion "26.0.2" + compileSdkVersion 28 + buildToolsVersion '28.0.3' defaultConfig { applicationId "tellh.com.recyclertreeview" minSdkVersion 14 @@ -20,13 +20,13 @@ android { } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) - androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', { + implementation fileTree(dir: 'libs', include: ['*.jar']) + testImplementation('com.android.support.test.espresso:espresso-core:2.2.2', { exclude group: 'com.android.support', module: 'support-annotations' }) - compile 'com.android.support:appcompat-v7:26.1.0' - compile 'com.android.support:recyclerview-v7:26.1.0' - testCompile 'junit:junit:4.12' - compile project(path: ':recyclertreeview-lib') + implementation 'androidx.appcompat:appcompat:1.0.0' + implementation 'androidx.recyclerview:recyclerview:1.0.0' + testImplementation 'junit:junit:4.12' + implementation project(path: ':recyclertreeview-lib') // compile 'com.github.TellH:RecyclerTreeView:1.2.0' } diff --git a/app/src/main/java/tellh/com/recyclertreeview/MainActivity.java b/app/src/main/java/tellh/com/recyclertreeview/MainActivity.java index 5fc3861..960959e 100644 --- a/app/src/main/java/tellh/com/recyclertreeview/MainActivity.java +++ b/app/src/main/java/tellh/com/recyclertreeview/MainActivity.java @@ -1,9 +1,11 @@ package tellh.com.recyclertreeview; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; + +import androidx.appcompat.app.AppCompatActivity; +import androidx.recyclerview.widget.RecyclerView; +import androidx.recyclerview.widget.LinearLayoutManager; + import android.view.Menu; import android.view.MenuItem; import android.widget.ImageView; diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 869486d..64eb07f 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -1,5 +1,6 @@ -