Skip to content

Commit afce8c8

Browse files
committed
Now uses latest build system, added fonts via font loader instead of typekit.
1 parent 2c96a52 commit afce8c8

File tree

23 files changed

+134
-694
lines changed

23 files changed

+134
-694
lines changed

.idea/caches/build_file_checksums.ser

538 Bytes
Binary file not shown.

.idea/compiler.xml

Lines changed: 1 addition & 17 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/gradle.xml

Lines changed: 3 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/jarRepositories.xml

Lines changed: 35 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/misc.xml

Lines changed: 22 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/modules.xml

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/build.gradle

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
apply plugin: 'com.android.application'
22

33
android {
4-
compileSdkVersion 25
5-
buildToolsVersion '25.0.2'
4+
compileSdkVersion 30
5+
buildToolsVersion '30.0.2'
66
defaultConfig {
77
applicationId "com.quotenspire.buddha"
8-
minSdkVersion 14
9-
targetSdkVersion 25
8+
minSdkVersion 16
9+
targetSdkVersion 30
1010
versionCode 21
1111
versionName "1.20"
1212
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -26,39 +26,38 @@ android {
2626
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
2727
}
2828
}
29-
29+
flavorDimensions "version"
3030
productFlavors {
31-
free {
32-
versionCode 28
33-
applicationId "com.quotenspire.buddha.free"
34-
versionName "1.27 Free"
35-
}
36-
3731
paid {
3832
versionCode 27
3933
applicationId "com.quotenspire.buddha.paid"
4034
versionName "1.26 Paid"
35+
dimension "version"
4136
}
4237
}
4338
}
4439

4540
dependencies {
46-
compile fileTree(dir: 'libs', include: ['*.jar'])
41+
implementation fileTree(dir: 'libs', include: ['*.jar'])
42+
implementation 'com.android.support:appcompat-v7:28.0.0'
4743
androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
4844
exclude group: 'com.android.support', module: 'support-annotations'
4945
})
50-
compile 'com.android.support:appcompat-v7:25.3.1'
51-
compile 'com.android.support:design:25.3.1'
52-
compile 'com.android.support:support-v4:25.3.1'
53-
freeCompile 'com.google.android.gms:play-services-ads-lite:11.0.4'
54-
freeCompile 'com.google.firebase:firebase-core:9.4.0'
46+
// def appcompat_version = "1.2.0"
47+
// implementation "androidx.appcompat:appcompat:$appcompat_version"
48+
// For loading and tinting drawables on older versions of the platform
49+
// implementation "androidx.appcompat:appcompat-resources:$appcompat_version"
50+
implementation 'com.android.support:design:28.0.0'
51+
implementation 'com.android.support:support-compat:28.0.0'
52+
// freeCompile 'com.google.android.gms:play-services-ads-lite:11.0.4'
53+
// freeCompile 'com.google.firebase:firebase-core:9.4.0'
5554
// compile 'com.android.support:support-vector-drawable:24.2.0'
5655
// compile 'com.android.support:animated-vector-drawable:24.2.0'
5756
// compile 'ch.acra:acra:4.9.0'
58-
testCompile 'junit:junit:4.12'
57+
testImplementation 'junit:junit:4.12'
5958

60-
compile 'com.tsengvn:typekit:1.0.1'
61-
compile 'com.github.marcoscgdev.EasyLicensesDialog:appcompatversion:1.0.4'
59+
// implementation 'com.tsengvn:typekit:1.0.1'
60+
implementation 'com.github.marcoscgdev.EasyLicensesDialog:appcompatversion:1.0.4'
6261

6362
// debugCompile 'com.squareup.leakcanary:leakcanary-android:1.4-beta2'
6463
// releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.4-beta2'

0 commit comments

Comments
 (0)