Исправил коллизии библиотек при билде
This commit is contained in:
2
.gitignore
vendored
2
.gitignore
vendored
@ -9,3 +9,5 @@
|
|||||||
/captures
|
/captures
|
||||||
.externalNativeBuild
|
.externalNativeBuild
|
||||||
tctable
|
tctable
|
||||||
|
/app/release
|
||||||
|
/app/build
|
||||||
@ -39,7 +39,6 @@ android {
|
|||||||
}
|
}
|
||||||
namespace 'kz.istt.locust'
|
namespace 'kz.istt.locust'
|
||||||
compileSdk 33
|
compileSdk 33
|
||||||
buildToolsVersion '34.0.0'
|
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
@ -54,6 +53,7 @@ dependencies {
|
|||||||
implementation 'com.google.android.gms:play-services-auth:20.4.0'
|
implementation 'com.google.android.gms:play-services-auth:20.4.0'
|
||||||
implementation 'com.google.maps.android:android-maps-utils:1.0.2'
|
implementation 'com.google.maps.android:android-maps-utils:1.0.2'
|
||||||
testImplementation 'junit:junit:4.12'
|
testImplementation 'junit:junit:4.12'
|
||||||
androidTestImplementation 'androidx.test.ext:junit:1.1.1'
|
androidTestImplementation 'androidx.test.ext:junit:1.1.5'
|
||||||
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
|
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
Binary file not shown.
@ -1,21 +0,0 @@
|
|||||||
{
|
|
||||||
"version": 3,
|
|
||||||
"artifactType": {
|
|
||||||
"type": "APK",
|
|
||||||
"kind": "Directory"
|
|
||||||
},
|
|
||||||
"applicationId": "kz.istt.locust",
|
|
||||||
"variantName": "release",
|
|
||||||
"elements": [
|
|
||||||
{
|
|
||||||
"type": "SINGLE",
|
|
||||||
"filters": [],
|
|
||||||
"attributes": [],
|
|
||||||
"versionCode": 101,
|
|
||||||
"versionName": "3.0.0",
|
|
||||||
"outputFile": "app-release.apk"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"elementType": "File",
|
|
||||||
"minSdkVersionForDexing": 15
|
|
||||||
}
|
|
||||||
@ -1,26 +0,0 @@
|
|||||||
package kz.istt.locust;
|
|
||||||
|
|
||||||
import android.content.Context;
|
|
||||||
import android.support.test.InstrumentationRegistry;
|
|
||||||
import android.support.test.runner.AndroidJUnit4;
|
|
||||||
|
|
||||||
import org.junit.Test;
|
|
||||||
import org.junit.runner.RunWith;
|
|
||||||
|
|
||||||
import static org.junit.Assert.*;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Instrumented test, which will execute on an Android device.
|
|
||||||
*
|
|
||||||
* @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
|
|
||||||
*/
|
|
||||||
@RunWith(AndroidJUnit4.class)
|
|
||||||
public class ExampleInstrumentedTest {
|
|
||||||
@Test
|
|
||||||
public void useAppContext() {
|
|
||||||
// Context of the app under test.
|
|
||||||
Context appContext = InstrumentationRegistry.getTargetContext();
|
|
||||||
|
|
||||||
assertEquals("kz.istt.locust", appContext.getPackageName());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Reference in New Issue
Block a user