diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 98033e6..7cd7009 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,137 +1,107 @@ - - - - - - - - - - - - + android:value=".ActivityPrincipal"/> - - + \ No newline at end of file diff --git a/build.gradle b/build.gradle index d026b4b..3b4be30 100644 --- a/build.gradle +++ b/build.gradle @@ -1,144 +1,144 @@ buildscript { repositories { jcenter() maven { url 'https://maven.google.com' } google() } ext { //multidex multidex_version = "2.0.1" //libraries versions fragment_version = "1.3.6" - activity_version = "1.2.4" + activity_version = "1.3.1" appcompat_version = "1.3.1" preference_version = "1.1.1" work_version = "2.5.0" acra_version = "5.7.0" lifecycle_version = "2.3.1" arch_version = "2.1.0" room_version = "2.3.0" //kotlin - kotlin_version = '1.5.0' + kotlin_version = '1.6.0' coroutines_version = "1.5.0" } dependencies { classpath 'com.android.tools.build:gradle:4.1.3' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } allprojects { repositories { jcenter() maven { url 'https://maven.google.com' } google() mavenCentral() } } apply plugin: 'com.android.application' apply plugin: 'kotlin-android' apply plugin: 'kotlin-kapt' android { - compileSdkVersion 29 - buildToolsVersion '29.0.3' + compileSdkVersion 30 + buildToolsVersion '30.0.3' defaultConfig { applicationId "it.reyboz.bustorino" minSdkVersion 16 - targetSdkVersion 29 + targetSdkVersion 30 versionCode 36 versionName "1.16.0" vectorDrawables.useSupportLibrary = true multiDexEnabled true } compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 } sourceSets { main { manifest.srcFile 'AndroidManifest.xml' java.srcDirs = ['src'] resources.srcDirs = ['src'] aidl.srcDirs = ['src'] renderscript.srcDirs = ['src'] res.srcDirs = ['res'] assets.srcDirs = ['assets'] } } buildTypes { debug { applicationIdSuffix ".debug" versionNameSuffix "-dev" } } lintOptions { abortOnError false } repositories { jcenter() mavenLocal() } dependencies { //new libraries implementation "androidx.fragment:fragment:$fragment_version" implementation "androidx.activity:activity:$activity_version" implementation "androidx.annotation:annotation:1.2.0" implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0" implementation "androidx.appcompat:appcompat:$appcompat_version" implementation "androidx.appcompat:appcompat-resources:$appcompat_version" implementation "androidx.preference:preference:$preference_version" implementation "androidx.work:work-runtime:$work_version" implementation "com.google.android.material:material:1.4.0" implementation 'androidx.constraintlayout:constraintlayout:2.1.1' implementation 'org.jsoup:jsoup:1.13.1' implementation 'com.readystatesoftware.sqliteasset:sqliteassethelper:2.0.1' implementation 'com.android.volley:volley:1.2.1' implementation 'org.osmdroid:osmdroid-android:6.1.10' // ACRA implementation "ch.acra:acra-mail:$acra_version" implementation "ch.acra:acra-dialog:$acra_version" // google transit realtime implementation 'com.google.protobuf:protobuf-java:3.14.0' // ViewModel implementation "androidx.lifecycle:lifecycle-viewmodel:$lifecycle_version" // LiveData implementation "androidx.lifecycle:lifecycle-livedata:$lifecycle_version" // Lifecycles only (without ViewModel or LiveData) implementation "androidx.lifecycle:lifecycle-runtime:$lifecycle_version" // Room components implementation "androidx.room:room-ktx:$room_version" kapt "androidx.room:room-compiler:$room_version" androidTestImplementation "androidx.room:room-testing:$room_version" //multidex - we need this to build the app implementation "androidx.multidex:multidex:$multidex_version" implementation 'de.siegmar:fastcsv:2.0.0' } } dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" api "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version" api "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines_version" } diff --git a/res/layout/activity_favorites.xml b/res/layout/activity_favorites.xml deleted file mode 100644 index fcb257f..0000000 --- a/res/layout/activity_favorites.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/res/layout/activity_main.xml b/res/layout/activity_main.xml deleted file mode 100644 index 63e13a8..0000000 --- a/res/layout/activity_main.xml +++ /dev/null @@ -1,184 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - -