Updated settings once again

petrazavadska · Sep 16, 2021 · 253cd5e · 253cd5e
1 parent 9f5f064
commit 253cd5e
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 38 deletions.
diff --git a/build.gradle b/build.gradle
@@ -3,19 +3,19 @@
 buildscript {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:7.0.2'
-
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }
 }
 
 allprojects {
     repositories {
-        jcenter()
         google()
+        mavenCentral()
+        maven { url 'https://jitpack.io' }
     }
 }
diff --git a/gradle.properties b/gradle.properties
@@ -11,28 +11,8 @@
 # The setting is particularly useful for tweaking memory settings.
 android.enableJetifier=true
 android.useAndroidX=true
-org.gradle.jvmargs=-Xmx1536m
 
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
-# org.gradle.parallel=true
-
-VERSION_NAME=4.2.5
-VERSION_CODE=56
-GROUP=com.wdullaer
-
-ANDROID_BUILD_MIN_SDK_VERSION=24
-ANDROID_BUILD_TARGET_SDK_VERSION=30
-ANDROID_BUILD_SDK_VERSION=30
-
-POM_DESCRIPTION=Material DateTimepicker
-POM_URL=https://github.com/wdullaer/MaterialDateTimePicker
-POM_SCM_URL=https://github.com/wdullaer/MaterialDateTimePicker
-POM_SCM_CONNECTION=scm:[email protected]:wdullaer/MaterialDateTimePicker.git
-POM_SCM_DEV_CONNECTION=scm:[email protected]:wdullaer/MaterialDateTimePicker.git
-POM_LICENCE_NAME=Apache v2 License
-POM_LICENCE_URL=https://github.com/wdullaer/MaterialDateTimePicker/blob/master/LICENSE
-POM_LICENCE_DIST=repo
-POM_DEVELOPER_ID=wdullaer
-POM_DEVELOPER_NAME=Wouter Dullaert
+# org.gradle.parallel=true
diff --git a/library/build.gradle b/library/build.gradle
@@ -1,12 +1,16 @@
-apply plugin: 'com.android.library'
-apply plugin: 'maven-publish'
+plugins {
+    id 'com.android.library'
+    id 'maven-publish'
+}
 
 android {
-    compileSdkVersion Integer.parseInt(project.ANDROID_BUILD_SDK_VERSION)
+    compileSdkVersion 30
 
     defaultConfig {
-        minSdkVersion Integer.parseInt(project.ANDROID_BUILD_MIN_SDK_VERSION)
-        targetSdkVersion Integer.parseInt(project.ANDROID_BUILD_TARGET_SDK_VERSION)
+        minSdkVersion 24
+        targetSdkVersion 30
+        versionCode 430
+        versionName "4.3.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
@@ -45,10 +49,6 @@ afterEvaluate {
         publications {
             release(MavenPublication) {
                 from components.release
-
-                groupId = 'com.wdullaer'
-                artifactId = 'materialdatetimepicker'
-                version = '4.2.7'
             }
         }
     }

diff --git a/sample/build.gradle b/sample/build.gradle
@@ -1,14 +1,14 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion Integer.parseInt(project.ANDROID_BUILD_SDK_VERSION)
+    compileSdkVersion 30
 
     defaultConfig {
         applicationId 'com.wdullaer.materialdatetimepicker.sample'
-        minSdkVersion Integer.parseInt(project.ANDROID_BUILD_MIN_SDK_VERSION)
-        targetSdkVersion Integer.parseInt(project.ANDROID_BUILD_TARGET_SDK_VERSION)
-        versionName project.VERSION_NAME
-        versionCode Integer.parseInt(project.VERSION_CODE)
+        minSdkVersion 24
+        targetSdkVersion 30
+        versionCode 1
+        versionName "1.0"
     }
 
     buildTypes {

diff --git a/settings.gradle b/settings.gradle
@@ -1 +1,2 @@
 include ':library', ':sample'
+project(':library').projectDir = new File('library')
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		include ':library', ':sample'
		project(':library').projectDir = new File('library')