Skip to content

Commit

Permalink
Develop (#3)
Browse files Browse the repository at this point in the history
- Updated target SDK version
  • Loading branch information
BhavinVala18 authored Mar 27, 2024
1 parent d583e80 commit 385fc7b
Show file tree
Hide file tree
Showing 14 changed files with 409 additions and 56 deletions.
3 changes: 1 addition & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@ local.properties
/app/build
/app/.idea
gradlew.bat
gradlew
/app/gradle
/app/gradlez
/app/local.properties
misc.xml
/buildSrc/build
Expand Down
43 changes: 27 additions & 16 deletions ShimmerTextView/build.gradle
Original file line number Diff line number Diff line change
@@ -1,40 +1,51 @@
plugins {
id 'com.android.library'
id 'org.jetbrains.kotlin.android'
id("com.android.library")
id("org.jetbrains.kotlin.android")
id("maven-publish")
}

android {
compileSdk 34
namespace = "com.app.shimmertextview"
compileSdk = 34

defaultConfig {
minSdk 22
targetSdk 34
versionCode 1
versionName "1.0.0"
minSdk = 22
targetSdk = 34

testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles "consumer-rules.pro"
}

buildTypes {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
minifyEnabled = false
proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
}
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}
kotlinOptions {
jvmTarget = '17'
}
namespace 'com.app.shimmertextview'
}

dependencies {
implementation("androidx.core:core-ktx:1.12.0")
implementation("androidx.appcompat:appcompat:1.6.1")
implementation("com.google.android.material:material:1.11.0")
}

implementation 'androidx.core:core-ktx:1.12.0'
implementation 'androidx.appcompat:appcompat:1.6.1'
implementation 'com.google.android.material:material:1.11.0'
afterEvaluate {
publishing {
publications {
release(MavenPublication) {
from components.release
groupId = 'com.github.Mindinventory' //your git id
artifactId = 'ShimmerTextView' //your-repository
version = '1.0.0' // As same as the Tag
}
}
}
}
39 changes: 20 additions & 19 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,42 +1,43 @@
plugins {
id 'com.android.application'
id 'org.jetbrains.kotlin.android'
id("com.android.application")
id("org.jetbrains.kotlin.android")
}

android {
compileSdk 34
namespace = "com.sample.shimmertextview"

compileSdk = 34

defaultConfig {
applicationId "com.app.shimmertextview"
minSdk 23
targetSdk 34
versionCode 1
versionName "1.0"
applicationId = "com.sample.shimmertextview"
minSdk = 23
targetSdk = 34
versionCode = 1
versionName = "1.0"

testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
}

buildTypes {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
minifyEnabled = false
proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
}
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}
kotlinOptions {
jvmTarget = '17'
}
namespace 'com.app.shimmertextview'
}

dependencies {

implementation 'androidx.core:core-ktx:1.12.0'
implementation 'androidx.appcompat:appcompat:1.6.1'
implementation 'com.google.android.material:material:1.11.0'
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
implementation project(path: ':ShimmerTextView')
implementation("androidx.core:core-ktx:1.12.0")
implementation("androidx.appcompat:appcompat:1.6.1")
implementation("com.google.android.material:material:1.11.0")
implementation("androidx.constraintlayout:constraintlayout:2.1.4")
implementation(project(":ShimmerTextView"))
}
5 changes: 2 additions & 3 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,16 @@
android:theme="@style/Theme.ShimmerTextView"
tools:targetApi="31">
<activity
android:name=".MainActivity"
android:name="com.sample.shimmertextview.MainActivity"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>

<activity
android:name=".OfferActivity"
android:name="com.sample.shimmertextview.OfferActivity"
android:exported="true" />
</application>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.app.shimmertextview
package com.sample.shimmertextview

import android.app.Activity
import android.content.Intent
Expand All @@ -9,6 +9,8 @@ import android.view.WindowManager
import androidx.appcompat.app.AppCompatActivity
import androidx.appcompat.widget.AppCompatButton
import androidx.core.content.ContextCompat
import com.app.shimmertextview.Shimmer
import com.app.shimmertextview.ShimmerTextView


class MainActivity : AppCompatActivity() {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
package com.app.shimmertextview
package com.sample.shimmertextview

import android.app.Activity
import android.graphics.Color
import android.os.Bundle
import android.view.View
import android.view.WindowManager
import androidx.appcompat.app.AppCompatActivity
import com.app.shimmertextview.ShimmerTextView

class OfferActivity : AppCompatActivity() {

Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout/activity_main.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".MainActivity"
tools:context="com.sample.shimmertextview.MainActivity"
android:background="@color/light_gray">

<androidx.cardview.widget.CardView
Expand Down
10 changes: 3 additions & 7 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
plugins {
id 'com.android.application' version '8.3.0' apply false
id 'com.android.library' version '8.3.0' apply false
id 'org.jetbrains.kotlin.android' version '1.8.0' apply false
}

tasks.register('clean', Delete) {
delete rootProject.layout.buildDirectory
id("com.android.application") version '8.3.1' apply false
id("com.android.library") version '8.3.1' apply false
id("org.jetbrains.kotlin.android") version "1.9.23" apply false
}
3 changes: 2 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,5 @@ kotlin.code.style=official
# thereby reducing the size of the R class for that library
android.nonTransitiveRClass=true
android.defaults.buildfeatures.buildconfig=true
android.nonFinalResIds=false
android.nonFinalResIds=false
android.enableJetifier=true
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
8 changes: 5 additions & 3 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
#Mon Jun 06 10:58:53 IST 2022
#Tue Mar 26 12:48:53 IST 2024
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading

0 comments on commit 385fc7b

Please sign in to comment.