瀏覽代碼

chore: Updated androidx dependencies, removed unused resources

beautusg 6 年之前
父節點
當前提交
a2faae8a13

+ 16 - 12
app/build.gradle

@@ -29,6 +29,10 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
+    }
 }
 
 dependencies {
@@ -40,14 +44,14 @@ dependencies {
     // Support Libraries
     implementation 'androidx.appcompat:appcompat:1.0.2'
     implementation 'androidx.recyclerview:recyclerview:1.0.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.0-alpha5'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta1'
 
     // Arch Components
-    implementation 'androidx.core:core-ktx:1.1.0-beta01'
+    implementation 'androidx.core:core-ktx:1.2.0-alpha02'
     implementation 'androidx.lifecycle:lifecycle-extensions:2.0.0'
     implementation 'android.arch.navigation:navigation-fragment:1.0.0'
-    implementation 'androidx.room:room-runtime:2.1.0-beta01'
-    kapt "androidx.room:room-compiler:2.1.0-beta01"
+    implementation 'androidx.room:room-runtime:2.1.0'
+    kapt "androidx.room:room-compiler:2.1.0"
     kapt "androidx.lifecycle:lifecycle-compiler:2.0.0"
 
     //3rd party libs
@@ -57,14 +61,14 @@ dependencies {
     // Test libs
     testImplementation 'junit:junit:4.12'
     testImplementation 'org.mockito:mockito-core:2.19.0'
-    androidTestImplementation 'androidx.room:room-testing:2.1.0-beta01'
-    androidTestImplementation 'androidx.test:runner:1.1.1'
-    androidTestImplementation 'androidx.test:rules:1.1.1'
-    androidTestImplementation 'androidx.annotation:annotation:1.0.2'
-    androidTestImplementation 'androidx.test:runner:1.1.1'
-    androidTestImplementation 'androidx.test:rules:1.1.1'
+    androidTestImplementation 'androidx.room:room-testing:2.1.0'
+    androidTestImplementation 'androidx.test:runner:1.2.0'
+    androidTestImplementation 'androidx.test:rules:1.2.0'
+    androidTestImplementation 'androidx.annotation:annotation:1.1.0'
+    androidTestImplementation 'androidx.test:runner:1.2.0'
+    androidTestImplementation 'androidx.test:rules:1.2.0'
     androidTestImplementation "androidx.arch.core:core-testing:2.0.1"
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
-    androidTestImplementation 'androidx.test.espresso:espresso-intents:3.1.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-intents:3.2.0'
 
 }

+ 0 - 9
app/src/main/AndroidManifest.xml

@@ -28,15 +28,6 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <provider
-            android:name="androidx.core.content.FileProvider"
-            android:authorities="@string/app_authority_for_file_provider"
-            android:exported="false"
-            android:grantUriPermissions="true">
-            <meta-data
-                android:name="android.support.FILE_PROVIDER_PATHS"
-                android:resource="@xml/filepaths" />
-        </provider>
     </application>
 
 </manifest>

+ 0 - 17
app/src/main/res/values/dimens.xml

@@ -1,21 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <!--<dimen name="splash_ic_box_size">30dp</dimen>-->
-    <!--<dimen name="splash_ic_box_marginTop">32dp</dimen>-->
 
-    <!--<dimen name="splash_welcome_margin">32dp</dimen>-->
-
-    <!--<dimen name="splash_welcome_font_size">24sp</dimen>-->
-    <!--<dimen name="splash_welcome_text_font_size">16sp</dimen>-->
-    <!--<dimen name="splash_welcome_text_width">164dp</dimen>-->
-    <!--<dimen name="splash_welcome_text_marginTop">90dp</dimen>-->
-    <!--<dimen name="splash_welcome_text_marginLeft">110dp</dimen>-->
-
-    <!--<dimen name="splash_phone_width">160dp</dimen>-->
-    <!--<dimen name="splash_phone_height">113dp</dimen>-->
-    <!--<dimen name="splash_phone_marginLeft">8dp</dimen>-->
-
-    <!--<dimen name="main_clock_marginTop">16dp</dimen>-->
-    <!--<dimen name="main_top_guide_begin">150dp</dimen>-->
-    <!--<dimen name="main_bottom_guide_end">56dp</dimen>-->
 </resources>

+ 0 - 1
app/src/main/res/values/strings.xml

@@ -1,6 +1,5 @@
 <resources>
     <string name="app_name">Slim Launcher</string>
-    <string name="app_authority_for_file_provider">com.sduduzog.slimlauncher.fileprovider</string>
     <string name="slim_url">http://sduduzog.github.io/slim-launcher/</string>
     <string name="main_placeholder_clock">00:00</string>
     <string name="main_placeholder_date">Sat, Apr 20</string>

+ 0 - 6
app/src/main/res/xml/filepaths.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Paths>
-    <files-path
-        name="vn"
-        path="audio/" />
-</Paths>

+ 2 - 2
build.gradle

@@ -1,13 +1,13 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.3.21'
+    ext.kotlin_version = '1.3.31'
     repositories {
         google()
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.4.0'
+        classpath 'com.android.tools.build:gradle:3.4.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong