Merge branch 'main' into master

# Conflicts: # BT901/build.gradle # Util/build.gradle # build.gradle
vdeconinck · May 1, 2022 · eb46209 · eb46209
2 parents ddc1433 + 29ec8be
commit eb46209
Show file tree

Hide file tree

Showing 5 changed files with 52 additions and 3 deletions.
diff --git a/BT901/build.gradle b/BT901/build.gradle
@@ -0,0 +1,25 @@
+apply plugin: 'com.android.library'
+
+android {
+    compileSdkVersion 31
+    buildToolsVersion '31.0.0'
+
+    defaultConfig {
+        minSdkVersion 18
+        targetSdkVersion 31
+        resConfigs 'en'
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
+        }
+    }
+}
+
+dependencies {
+    implementation files('libs/MPAndroidChart-v3.0.2.jar')
+    implementation 'com.google.android.material:material:1.4.0'
+    implementation project(':Util')
+}
diff --git a/Main/build.gradle b/Main/build.gradle
@@ -25,7 +25,7 @@ android {
         targetSdkVersion 31
         versionCode 1
         versionName "1.0"
-        resConfigs "en"
+        resConfigs 'en'
 
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
     }

diff --git a/Util/build.gradle b/Util/build.gradle
@@ -0,0 +1,24 @@
+apply plugin: 'com.android.library'
+
+android {
+    compileSdkVersion 31
+    buildToolsVersion "31.0.0"
+
+    defaultConfig {
+        minSdkVersion 18
+        targetSdkVersion 31
+        resConfigs 'en'
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+    }
+}
+
+dependencies {
+    implementation fileTree(dir: "libs", include: ["*.jar"])
+    implementation 'androidx.appcompat:appcompat:1.3.1'
+}
diff --git a/build.gradle b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.1'
+        classpath 'com.android.tools.build:gradle:7.1.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip