Skip to content

Commit

Permalink
Merge pull request #26 from skydoves/update/properties
Browse files Browse the repository at this point in the history
Update Gradle properties
  • Loading branch information
skydoves authored Jun 18, 2022
2 parents 106e34c + 49bc9a4 commit 4749c58
Show file tree
Hide file tree
Showing 9 changed files with 292 additions and 249 deletions.
1 change: 0 additions & 1 deletion bindables/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ android {
jvmTarget = '1.8'
}
buildFeatures {
buildConfig false
dataBinding true
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ import android.os.Bundle
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import androidx.annotation.CallSuper
import androidx.annotation.LayoutRes
import androidx.databinding.DataBindingComponent
import androidx.databinding.DataBindingUtil
Expand Down Expand Up @@ -71,13 +70,13 @@ public abstract class BindingBottomSheetDialogFragment<T : ViewDataBinding> cons
/**
* Ensures the [binding] property should be executed and provide the inflated view which depends on [contentLayoutId].
*/
@CallSuper
override fun onCreateView(
inflater: LayoutInflater,
container: ViewGroup?,
savedInstanceState: Bundle?
): View {
_binding = DataBindingUtil.inflate(inflater, contentLayoutId, container, false, bindingComponent)
_binding =
DataBindingUtil.inflate(inflater, contentLayoutId, container, false, bindingComponent)
return binding.root
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ import android.os.Bundle
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import androidx.annotation.CallSuper
import androidx.annotation.LayoutRes
import androidx.databinding.DataBindingComponent
import androidx.databinding.DataBindingUtil
Expand Down Expand Up @@ -71,13 +70,13 @@ public abstract class BindingDialogFragment<T : ViewDataBinding> constructor(
/**
* Ensures the [binding] property should be executed and provide the inflated view which depends on [contentLayoutId].
*/
@CallSuper
override fun onCreateView(
inflater: LayoutInflater,
container: ViewGroup?,
savedInstanceState: Bundle?
): View {
_binding = DataBindingUtil.inflate(inflater, contentLayoutId, container, false, bindingComponent)
_binding =
DataBindingUtil.inflate(inflater, contentLayoutId, container, false, bindingComponent)
return binding.root
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ import android.os.Bundle
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import androidx.annotation.CallSuper
import androidx.annotation.LayoutRes
import androidx.databinding.DataBindingComponent
import androidx.databinding.DataBindingUtil
Expand Down Expand Up @@ -71,13 +70,13 @@ public abstract class BindingFragment<T : ViewDataBinding> constructor(
/**
* Ensures the [binding] property should be executed and provide the inflated view which depends on [contentLayoutId].
*/
@CallSuper
override fun onCreateView(
inflater: LayoutInflater,
container: ViewGroup?,
savedInstanceState: Bundle?
): View {
_binding = DataBindingUtil.inflate(inflater, contentLayoutId, container, false, bindingComponent)
_binding =
DataBindingUtil.inflate(inflater, contentLayoutId, container, false, bindingComponent)
return binding.root
}

Expand Down
54 changes: 24 additions & 30 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -14,38 +14,32 @@
# limitations under the License.
#

# Jvm environments
org.gradle.jvmargs=-Xmx4g
# https://docs.gradle.org/current/userguide/build_environment.html#sec:configuring_jvm_memory
org.gradle.jvmargs=-Xmx4g -XX:+HeapDumpOnOutOfMemoryError -XX:+UseParallelGC -XX:MaxMetaspaceSize=512m -Dkotlin.daemon.jvm.options=-XX:MaxMetaspaceSize=1g -Dlint.nullness.ignore-deprecated=true

# AndroidX
android.useAndroidX=true

# Required to publish to Nexus
systemProp.org.gradle.internal.publish.checksums.insecure=true

# Increase timeout when pushing to Sonatype
systemProp.org.gradle.internal.http.connectionTimeout=120000
systemProp.org.gradle.internal.http.socketTimeout=120000
# https://docs.gradle.org/current/userguide/build_cache.html
org.gradle.caching=true

# Maven
GROUP=com.github.skydoves
POM_PACKAGING=aar
# 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=1.1.0-SNAPSHOT
# Configure only necessary projects, useful with multimodule projects
org.gradle.configureondemand=true

POM_ARTIFACT_ID=bindables
POM_NAME=bindables
POM_DESCRIPTION=Android DataBinding kit for notifying data changes from Model layers to UI layers.

POM_URL=https://github.com/skydoves/bindables/
POM_SCM_URL=https://github.com/skydoves/bindables/
POM_SCM_CONNECTION=scm:git:git://github.com/skydoves/bindables.git
POM_SCM_DEV_CONNECTION=scm:git:git://github.com/skydoves/bindables.git

POM_LICENCE_NAME=The Apache Software License, Version 2.0
POM_LICENCE_URL=http://www.apache.org/licenses/LICENSE-2.0.txt
POM_LICENCE_DIST=repo
# AndroidX Migration https://developer.android.com/jetpack/androidx/migrate
android.useAndroidX=true

POM_DEVELOPER_ID=skydoves
POM_DEVELOPER_NAME=Jaewoong Eum
POM_DEVELOPER_URL=https://github.com/skydoves/
# Removes uneccessary default build features
android.defaults.buildfeatures.aidl=false
android.defaults.buildfeatures.buildconfig=false
android.defaults.buildfeatures.renderscript=false
android.defaults.buildfeatures.resvalues=false
android.defaults.buildfeatures.shaders=false

# Enables namespacing of each library's R class so that its R class includes only the
# resources declared in the library itself and none from the library's dependencies,
# thereby reducing the size of the R class for that library
# https://developer.android.com/studio/releases/gradle-plugin#4.1-nontransitive-r-class
android.nonTransitiveRClass=true
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
16 changes: 1 addition & 15 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,19 +1,5 @@
#Designed and developed by 2021 skydoves (Jaewoong Eum)
#
#Licensed under the Apache License, Version 2.0 (the "License");
#you may not use this file except in compliance with the License.
#You may obtain a copy of the License at
#
#http://www.apache.org/licenses/LICENSE-2.0
#
#Unless required by applicable law or agreed to in writing, software
#distributed under the License is distributed on an "AS IS" BASIS,
#WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
#See the License for the specific language governing permissions and
#limitations under the License.
#Thu Feb 11 00:48:43 KST 2021
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-all.zip
Loading

0 comments on commit 4749c58

Please sign in to comment.