This commit is contained in:
Harald Hoyer 2018-07-06 15:00:39 +02:00
parent 081f26a49e
commit 4826e96d5e
5 changed files with 16 additions and 30 deletions

View file

@ -21,6 +21,7 @@
</content> </content>
<orderEntry type="inheritedJdk" /> <orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" exported="" name="android_antlib_4-14-0.android_antlib_4-14-0" level="project" /> <orderEntry type="library" exported="" name="android_antlib_4-14-0.android_antlib_4-14-0" level="project" />
</component> </component>
</module> </module>

View file

@ -0,0 +1,2 @@
configurations.maybeCreate("default")
artifacts.add("default", file('android_antlib_4-14-0.jar'))

View file

@ -116,31 +116,18 @@
</content> </content>
<orderEntry type="jdk" jdkName="Android API 24 Platform" jdkType="Android SDK" /> <orderEntry type="jdk" jdkName="Android API 24 Platform" jdkType="Android SDK" />
<orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="Gradle: com.android.support.constraint:constraint-layout-solver:1.0.2@jar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test.espresso:espresso-idling-resource-2.2.2" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: javax.annotation:javax.annotation-api:1.2@jar" level="project" />
<orderEntry type="library" name="Gradle: com.android.support:support-vector-drawable-24.2.1" level="project" />
<orderEntry type="library" name="Gradle: com.android.support:support-core-utils-24.2.1" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test.espresso:espresso-core-2.2.2" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: com.squareup:javawriter:2.1.1@jar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test:rules-0.5" level="project" />
<orderEntry type="library" name="Gradle: com.android.support:animated-vector-drawable-24.2.1" level="project" /> <orderEntry type="library" name="Gradle: com.android.support:animated-vector-drawable-24.2.1" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: com.google.code.findbugs:jsr305:2.0.1@jar" level="project" />
<orderEntry type="library" name="Gradle: com.android.support:support-compat-24.2.1" level="project" /> <orderEntry type="library" name="Gradle: com.android.support:support-compat-24.2.1" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: javax.inject:javax.inject:1@jar" level="project" />
<orderEntry type="library" name="Gradle: com.android.support.constraint:constraint-layout-1.0.2" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12@jar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3@jar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test:runner-0.5" level="project" />
<orderEntry type="library" name="Gradle: com.android.support:support-annotations:24.2.1@jar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test:exposed-instrumentation-api-publish-0.5" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-library:1.3@jar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-integration:1.3@jar" level="project" />
<orderEntry type="library" name="Gradle: com.android.support:support-core-ui-24.2.1" level="project" /> <orderEntry type="library" name="Gradle: com.android.support:support-core-ui-24.2.1" level="project" />
<orderEntry type="library" name="Gradle: com.android.support.constraint:constraint-layout-1.1.2" level="project" />
<orderEntry type="library" name="Gradle: com.android.support:support-v4-24.2.1" level="project" /> <orderEntry type="library" name="Gradle: com.android.support:support-v4-24.2.1" level="project" />
<orderEntry type="library" name="Gradle: com.android.support:support-fragment-24.2.1" level="project" /> <orderEntry type="library" name="Gradle: com.android.support:support-fragment-24.2.1" level="project" />
<orderEntry type="library" name="Gradle: com.android.support:appcompat-v7-24.2.1" level="project" /> <orderEntry type="library" name="Gradle: com.android.support:appcompat-v7-24.2.1" level="project" />
<orderEntry type="library" name="Gradle: com.android.support:support-annotations:24.2.1@jar" level="project" />
<orderEntry type="library" name="Gradle: com.android.support:support-media-compat-24.2.1" level="project" /> <orderEntry type="library" name="Gradle: com.android.support:support-media-compat-24.2.1" level="project" />
<orderEntry type="library" name="Gradle: com.android.support:support-vector-drawable-24.2.1" level="project" />
<orderEntry type="library" name="Gradle: com.android.support.constraint:constraint-layout-solver:1.1.2@jar" level="project" />
<orderEntry type="library" name="Gradle: com.android.support:support-core-utils-24.2.1" level="project" />
<orderEntry type="module" module-name="android_antlib_4-14-0" /> <orderEntry type="module" module-name="android_antlib_4-14-0" />
</component> </component>
</module> </module>

View file

@ -2,14 +2,13 @@ apply plugin: 'com.android.application'
android { android {
compileSdkVersion 24 compileSdkVersion 24
buildToolsVersion "25.0.0" buildToolsVersion '27.0.3'
defaultConfig { defaultConfig {
applicationId "xyz.hoyer.iconsole" applicationId "xyz.hoyer.iconsole"
minSdkVersion 15 minSdkVersion 15
targetSdkVersion 24 targetSdkVersion 24
versionCode 1 versionCode 1
versionName "1.0" versionName "1.0"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
} }
buildTypes { buildTypes {
release { release {
@ -20,13 +19,9 @@ android {
} }
dependencies { dependencies {
compile fileTree(include: ['*.jar'], dir: 'libs') implementation fileTree(include: ['*.jar'], dir: 'libs')
androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', { implementation 'com.android.support:appcompat-v7:24.2.1'
exclude group: 'com.android.support', module: 'support-annotations' implementation 'com.android.support:support-v4:24.2.1'
}) implementation 'com.android.support.constraint:constraint-layout:1.1.2'
compile 'com.android.support:appcompat-v7:24.2.1' implementation project(':android_antlib_4-14-0')
compile 'com.android.support:support-v4:24.2.1'
testCompile 'junit:junit:4.12'
compile 'com.android.support.constraint:constraint-layout:1.0.2'
compile project(':android_antlib_4-14-0')
} }

View file

@ -16,6 +16,7 @@ buildscript {
allprojects { allprojects {
repositories { repositories {
jcenter() jcenter()
google()
} }
} }