From 2c77755828d072e09d37079fcd2f5f07a7fc9d74 Mon Sep 17 00:00:00 2001 From: localhorst Date: Wed, 30 Mar 2022 18:05:58 +0200 Subject: [PATCH] changed package name --- app/build.gradle | 20 +++++++++---------- .../ExampleInstrumentedTest.java | 6 +++--- app/src/main/AndroidManifest.xml | 4 ++-- .../MainActivity.java | 4 ++-- app/src/main/res/layout/activity_main.xml | 4 ++-- .../layout/activity_permission_requester.xml | 4 ++-- .../ExampleUnitTest.java | 2 +- build.gradle | 4 ++-- gradle.properties | 2 ++ gradlew | 0 10 files changed, 26 insertions(+), 24 deletions(-) rename app/src/androidTest/java/fmaps/grabow/com/{location001 => externgnss}/ExampleInstrumentedTest.java (79%) rename app/src/main/java/fmaps/grabow/com/{location001 => externgnss}/MainActivity.java (99%) rename app/src/test/java/fmaps/grabow/com/{location001 => externgnss}/ExampleUnitTest.java (90%) mode change 100644 => 100755 gradlew diff --git a/app/build.gradle b/app/build.gradle index 0ef4ad1..b50867e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,14 +1,14 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 28 + compileSdkVersion 30 defaultConfig { - applicationId "fmaps.grabow.com.location001" + applicationId "fmaps.grabow.com.externgnss" minSdkVersion 14 - targetSdkVersion 28 + targetSdkVersion 30 versionCode 1 versionName "1.0" - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' } buildTypes { release { @@ -20,11 +20,11 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation 'com.android.support:appcompat-v7:28.0.0' - implementation 'com.android.support.constraint:constraint-layout:1.1.3' - implementation 'pub.devrel:easypermissions:2.0.1' - implementation 'com.android.support:design:28.0.0' + implementation 'androidx.appcompat:appcompat:1.0.0' + implementation 'androidx.constraintlayout:constraintlayout:1.1.3' + implementation 'pub.devrel:easypermissions:3.0.0' + implementation 'com.google.android.material:material:1.0.0' testImplementation 'junit:junit:4.12' - androidTestImplementation 'com.android.support.test:runner:1.0.2' - androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2' + androidTestImplementation 'androidx.test.ext:junit:1.1.1' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' } diff --git a/app/src/androidTest/java/fmaps/grabow/com/location001/ExampleInstrumentedTest.java b/app/src/androidTest/java/fmaps/grabow/com/externgnss/ExampleInstrumentedTest.java similarity index 79% rename from app/src/androidTest/java/fmaps/grabow/com/location001/ExampleInstrumentedTest.java rename to app/src/androidTest/java/fmaps/grabow/com/externgnss/ExampleInstrumentedTest.java index 4710532..1bad90e 100644 --- a/app/src/androidTest/java/fmaps/grabow/com/location001/ExampleInstrumentedTest.java +++ b/app/src/androidTest/java/fmaps/grabow/com/externgnss/ExampleInstrumentedTest.java @@ -1,8 +1,8 @@ -package fmaps.grabow.com.location001; +package fmaps.grabow.com.externgnss; import android.content.Context; -import android.support.test.InstrumentationRegistry; -import android.support.test.runner.AndroidJUnit4; +import androidx.test.platform.app.InstrumentationRegistry; +import androidx.test.ext.junit.runners.AndroidJUnit4; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 28c1d28..367492f 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,6 +1,6 @@ + package="fmaps.grabow.com.externgnss"> @@ -12,7 +12,7 @@ android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/AppTheme"> - + diff --git a/app/src/main/java/fmaps/grabow/com/location001/MainActivity.java b/app/src/main/java/fmaps/grabow/com/externgnss/MainActivity.java similarity index 99% rename from app/src/main/java/fmaps/grabow/com/location001/MainActivity.java rename to app/src/main/java/fmaps/grabow/com/externgnss/MainActivity.java index b0f37d3..53df422 100644 --- a/app/src/main/java/fmaps/grabow/com/location001/MainActivity.java +++ b/app/src/main/java/fmaps/grabow/com/externgnss/MainActivity.java @@ -1,11 +1,11 @@ -package fmaps.grabow.com.location001; +package fmaps.grabow.com.externgnss; import android.Manifest; import android.annotation.SuppressLint; import android.content.Context; import android.location.LocationListener; import android.location.LocationManager; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatActivity; import android.os.Bundle; import android.util.Log; import android.widget.TextView; diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 6a9ae8c..cdb371f 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_permission_requester.xml b/app/src/main/res/layout/activity_permission_requester.xml index 6a2c0d0..b08ef80 100644 --- a/app/src/main/res/layout/activity_permission_requester.xml +++ b/app/src/main/res/layout/activity_permission_requester.xml @@ -1,9 +1,9 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/test/java/fmaps/grabow/com/location001/ExampleUnitTest.java b/app/src/test/java/fmaps/grabow/com/externgnss/ExampleUnitTest.java similarity index 90% rename from app/src/test/java/fmaps/grabow/com/location001/ExampleUnitTest.java rename to app/src/test/java/fmaps/grabow/com/externgnss/ExampleUnitTest.java index 26092c7..a0323b4 100644 --- a/app/src/test/java/fmaps/grabow/com/location001/ExampleUnitTest.java +++ b/app/src/test/java/fmaps/grabow/com/externgnss/ExampleUnitTest.java @@ -1,4 +1,4 @@ -package fmaps.grabow.com.location001; +package fmaps.grabow.com.externgnss; import org.junit.Test; diff --git a/build.gradle b/build.gradle index 89d187a..30178be 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,7 @@ buildscript { repositories { google() - jcenter() + mavenCentral() } dependencies { classpath 'com.android.tools.build:gradle:7.1.2' @@ -16,7 +16,7 @@ buildscript { allprojects { repositories { google() - jcenter() + mavenCentral() } } diff --git a/gradle.properties b/gradle.properties index 82618ce..d546dea 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,6 +6,8 @@ # http://www.gradle.org/docs/current/userguide/build_environment.html # Specifies the JVM arguments used for the daemon process. # The setting is particularly useful for tweaking memory settings. +android.enableJetifier=true +android.useAndroidX=true org.gradle.jvmargs=-Xmx1536m # When configured, Gradle will run in incubating parallel mode. # This option should only be used with decoupled projects. More details, visit diff --git a/gradlew b/gradlew old mode 100644 new mode 100755