diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 6e5b9c2..be79e6b 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -9,13 +9,13 @@ android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/AppTheme"> - + \ No newline at end of file diff --git a/app/src/main/java/com/mytest/javaapplication/MainActivity.java b/app/src/main/java/com/mytest/javaapplication/MainActivity.java index 3b04d2e..695d430 100644 --- a/app/src/main/java/com/mytest/javaapplication/MainActivity.java +++ b/app/src/main/java/com/mytest/javaapplication/MainActivity.java @@ -1,4 +1,5 @@ package com.mytest.javaapplication; +/* import android.support.v7.app.AppCompatActivity; import android.os.Bundle; @@ -13,3 +14,4 @@ protected void onCreate(Bundle savedInstanceState) { setContentView(R.layout.activity_main); } } +*/ diff --git a/mylibrary/build.gradle b/mylibrary/build.gradle index b9a52bf..10cc453 100644 --- a/mylibrary/build.gradle +++ b/mylibrary/build.gradle @@ -26,8 +26,6 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - - implementation 'com.android.support:appcompat-v7:26.1.0' testImplementation 'junit:junit:4.12' androidTestImplementation 'com.android.support.test:runner:1.0.1' androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1' diff --git a/mylibrary/mylibrary.iml b/mylibrary/mylibrary.iml index 360e1d4..6c6faa3 100644 --- a/mylibrary/mylibrary.iml +++ b/mylibrary/mylibrary.iml @@ -90,7 +90,7 @@ - + @@ -100,30 +100,18 @@ - + + - + + - - - - - - - + + - - - - - - - - - \ No newline at end of file