Skip to content

Commit 9bb7357

Browse files
author
wanjian
committed
no message
1 parent 1d8d3f8 commit 9bb7357

File tree

13 files changed

+19
-124
lines changed

13 files changed

+19
-124
lines changed

app/build.gradle

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ apply plugin: 'com.android.application'
22
apply plugin: "com.wanjian.tinypng"
33
android {
44
compileSdkVersion 28
5+
buildToolsVersion "28.0.3"
56
defaultConfig {
67
applicationId "com.wanjian.tinypngplugin.demo"
78
minSdkVersion 19
89
targetSdkVersion 28
910
versionCode 1
1011
versionName "1.0"
11-
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
1212
}
1313
buildTypes {
1414
release {
@@ -54,13 +54,8 @@ android {
5454
}
5555

5656
dependencies {
57-
implementation fileTree(include: ['*.jar'], dir: 'libs')
58-
implementation 'com.android.support:appcompat-v7:28.0.0'
59-
implementation 'com.android.support.constraint:constraint-layout:1.1.3'
60-
testImplementation 'junit:junit:4.12'
61-
androidTestImplementation 'com.android.support.test:runner:1.0.2'
62-
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
63-
implementation project(':module2')
57+
compile fileTree(include: ['*.jar'], dir: 'libs')
58+
compile project(':module2')
6459
}
6560

6661
tinyPng {

app/src/androidTest/java/com/wanjian/tinypngplugin/demo/ExampleInstrumentedTest.java

Lines changed: 0 additions & 26 deletions
This file was deleted.

app/src/main/java/com/wanjian/tinypngplugin/demo/MainActivity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package com.wanjian.tinypngplugin.demo;
22

3-
import android.support.v7.app.AppCompatActivity;
3+
import android.app.Activity;
44
import android.os.Bundle;
55

6-
public class MainActivity extends AppCompatActivity {
6+
public class MainActivity extends Activity {
77

88
@Override
99
protected void onCreate(Bundle savedInstanceState) {
Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
2+
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
33
xmlns:app="http://schemas.android.com/apk/res-auto"
44
xmlns:tools="http://schemas.android.com/tools"
55
android:layout_width="match_parent"
@@ -10,9 +10,10 @@
1010
android:layout_width="wrap_content"
1111
android:layout_height="wrap_content"
1212
android:text="Hello World!"
13-
app:layout_constraintBottom_toBottomOf="parent"
14-
app:layout_constraintLeft_toLeftOf="parent"
15-
app:layout_constraintRight_toRightOf="parent"
16-
app:layout_constraintTop_toTopOf="parent" />
13+
/>
14+
<ImageView
15+
android:layout_width="wrap_content"
16+
android:layout_height="wrap_content"
17+
android:src="@mipmap/ic_launcher"/>
1718

18-
</android.support.constraint.ConstraintLayout>
19+
</LinearLayout>
312 Bytes
Loading

app/src/main/res/values/styles.xml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
11
<resources>
22

33
<!-- Base application theme. -->
4-
<style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
4+
<style name="AppTheme">
55
<!-- Customize your theme here. -->
6-
<item name="colorPrimary">@color/colorPrimary</item>
7-
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
8-
<item name="colorAccent">@color/colorAccent</item>
96
</style>
107

118
</resources>
Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
2+
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
33
xmlns:app="http://schemas.android.com/apk/res-auto"
44
xmlns:tools="http://schemas.android.com/tools"
55
android:layout_width="match_parent"
@@ -10,9 +10,6 @@
1010
android:layout_width="wrap_content"
1111
android:layout_height="wrap_content"
1212
android:text="Hello World!"
13-
app:layout_constraintBottom_toBottomOf="parent"
14-
app:layout_constraintLeft_toLeftOf="parent"
15-
app:layout_constraintRight_toRightOf="parent"
16-
app:layout_constraintTop_toTopOf="parent" />
13+
/>
1714

18-
</android.support.constraint.ConstraintLayout>
15+
</LinearLayout>

app/src/test/java/com/wanjian/tinypngplugin/demo/ExampleUnitTest.java

Lines changed: 0 additions & 17 deletions
This file was deleted.

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ buildscript {
1010
jcenter()
1111
}
1212
dependencies {
13-
classpath 'com.android.tools.build:gradle:3.0.0'
13+
classpath 'com.android.tools.build:gradle:3.1.4'
1414
classpath "com.wanjian.plugin:tinypng:1.0.0-SNAPSHOT"
1515

1616

module2/build.gradle

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
22
apply plugin: "com.wanjian.tinypng"
33
android {
44
compileSdkVersion 28
5-
5+
buildToolsVersion "28.0.3"
66

77

88
defaultConfig {
@@ -11,8 +11,6 @@ android {
1111
versionCode 1
1212
versionName "1.0"
1313

14-
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
15-
1614
}
1715

1816
buildTypes {
@@ -25,12 +23,7 @@ android {
2523
}
2624

2725
dependencies {
28-
implementation fileTree(dir: 'libs', include: ['*.jar'])
29-
30-
implementation 'com.android.support:appcompat-v7:28.0.0'
31-
testImplementation 'junit:junit:4.12'
32-
androidTestImplementation 'com.android.support.test:runner:1.0.2'
33-
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
26+
compile fileTree(dir: 'libs', include: ['*.jar'])
3427
}
3528
tinyPng {
3629
enable true

module2/src/androidTest/java/com/wanjian/module2/ExampleInstrumentedTest.java

Lines changed: 0 additions & 26 deletions
This file was deleted.

module2/src/test/java/com/wanjian/module2/ExampleUnitTest.java

Lines changed: 0 additions & 17 deletions
This file was deleted.

tinypng/build.gradle

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ repositories {
77

88
dependencies {
99
compile gradleApi()
10-
// https://mvnrepository.com/artifact/org.javassist/javassist
11-
// compile group: 'org.javassist', name: 'javassist', version: '3.23.1-GA'
1210
compile 'com.tinify:tinify:1.1.1'
1311
}
1412

0 commit comments

Comments
 (0)