Skip to content

Commit bdd5aa2

Browse files
committed
Project and build script clean up
- Renamed "calcdialog" module to "lib" - Removed unnecessary files in modules: gitignore, gradlew, gradle wrapper, etc - Removed unused proguard configuration files - Moved versions and publish info to gradle.properties - Updated changelog - Updated publishing scripts
1 parent 812992c commit bdd5aa2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+134
-463
lines changed

.gitignore

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,12 @@
1-
# files for the dex VM
2-
*.dex
3-
4-
# Java class files
5-
*.class
6-
7-
# Local configuration file (sdk path, etc)
8-
local.properties
9-
10-
# Windows thumbnail db
11-
Thumbs.db
12-
13-
# OSX files
14-
.DS_Store
1+
/todo.md
152

163
# Android Studio
4+
local.properties
175
*.iml
186
.idea
197
.gradle
208
build/
21-
captures/
9+
10+
# OS files
11+
Thumbs.db
12+
.DS_Store

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## v2.1.2
2+
- Fixed many NPE on some devices.
3+
- Fixed `Expression` parcel implementation.
4+
15
## v2.1.1
26
- Disabled RTL layout in dialog.
37

app/.gitignore

Lines changed: 0 additions & 1 deletion
This file was deleted.

app/build.gradle

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,22 @@
1-
apply plugin: 'com.android.application'
1+
apply plugin: "com.android.application"
22

33
android {
4-
compileSdkVersion 29
4+
compileSdkVersion setup.compileSdk
5+
buildToolsVersion setup.buildTools
56
defaultConfig {
67
applicationId "com.maltaisn.calcdialoglib"
7-
minSdkVersion 16
8-
targetSdkVersion 29
8+
minSdkVersion setup.minSdk
9+
targetSdkVersion setup.targetSdk
910
versionCode 1
1011
versionName "1.0"
11-
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1212
}
13-
buildTypes {
14-
release {
15-
minifyEnabled false
16-
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
17-
}
18-
}
19-
buildToolsVersion '29.0.2'
2013
}
2114

2215
dependencies {
23-
testImplementation 'junit:junit:4.12'
16+
implementation project(":lib")
2417

25-
implementation 'androidx.appcompat:appcompat:1.1.0'
26-
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
18+
implementation "androidx.appcompat:appcompat:$appCompatVersion"
19+
implementation "androidx.constraintlayout:constraintlayout:$constraintLayoutVersion"
2720

28-
implementation project(':calcdialog')
21+
testImplementation "junit:junit:$junitVersion"
2922
}

app/proguard-rules.pro

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

build.gradle

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,34 @@
1-
// Top-level build file where you can add configuration options common to all sub-projects/modules.
2-
31
buildscript {
4-
2+
ext {
3+
setup = [
4+
compileSdk: 29,
5+
buildTools: "29.0.2",
6+
minSdk: 16,
7+
targetSdk: 29
8+
]
9+
}
510
repositories {
611
google()
712
jcenter()
813
}
914
dependencies {
10-
classpath 'com.android.tools.build:gradle:3.5.1'
11-
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
12-
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
13-
14-
// NOTE: Do not place your application dependencies here; they belong
15-
// in the individual module build.gradle files
15+
classpath "com.android.tools.build:gradle:3.5.3"
16+
classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4"
17+
classpath "com.github.dcendents:android-maven-gradle-plugin:2.1"
1618
}
1719
}
1820

21+
plugins {
22+
id "base"
23+
}
24+
1925
allprojects {
2026
repositories {
2127
google()
2228
jcenter()
2329
}
2430
}
2531

26-
task clean(type: Delete) {
32+
clean {
2733
delete rootProject.buildDir
2834
}

calcdialog/.gitignore

Lines changed: 0 additions & 1 deletion
This file was deleted.

calcdialog/bintray.gradle

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

calcdialog/build.gradle

Lines changed: 0 additions & 60 deletions
This file was deleted.
-52.4 KB
Binary file not shown.

0 commit comments

Comments
 (0)