Skip to content

Commit

Permalink
Update gradle
Browse files Browse the repository at this point in the history
  • Loading branch information
ahmadimaduddin committed Oct 19, 2018
1 parent 850bc05 commit 371a9eb
Show file tree
Hide file tree
Showing 16 changed files with 33 additions and 36 deletions.
Binary file modified 04.Navigation/MyActionBar/.idea/caches/build_file_checksums.ser
Binary file not shown.
10 changes: 7 additions & 3 deletions 04.Navigation/MyActionBar/.idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions 04.Navigation/MyActionBar/app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 25
buildToolsVersion '27.0.3'
compileSdkVersion 28
buildToolsVersion '28.0.3'
defaultConfig {
applicationId "com.dicoding.www.myactionbar"
applicationId "com.dicoding.picodiploma.myactionbar"
minSdkVersion 21
targetSdkVersion 25
targetSdkVersion 28
versionCode 1
versionName "1.0"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
Expand All @@ -24,7 +24,7 @@ dependencies {
androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
exclude group: 'com.android.support', module: 'support-annotations'
})
implementation 'com.android.support:appcompat-v7:25.4.0'
implementation 'com.android.support:support-v4:25.4.0'
implementation 'com.android.support:appcompat-v7:28.0.0'
implementation 'com.android.support:support-v4:28.0.0'
testImplementation 'junit:junit:4.12'
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.dicoding.www.myactionbar;
package com.dicoding.picodiploma.myactionbar;

import android.content.Context;
import android.support.test.InstrumentationRegistry;
Expand Down
2 changes: 1 addition & 1 deletion 04.Navigation/MyActionBar/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.dicoding.www.myactionbar">
package="com.dicoding.picodiploma.myactionbar">

<application
android:allowBackup="true"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.dicoding.www.myactionbar;
package com.dicoding.picodiploma.myactionbar;

import android.content.Intent;
import android.os.Bundle;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.dicoding.www.myactionbar;
package com.dicoding.picodiploma.myactionbar;


import android.os.Bundle;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.dicoding.www.myactionbar;
package com.dicoding.picodiploma.myactionbar;

import android.os.Bundle;
import android.support.v4.app.Fragment;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin"
tools:context="com.dicoding.www.myactionbar.MainActivity">
tools:context="com.dicoding.picodiploma.myactionbar.MainActivity">

<FrameLayout
android:id="@+id/fragment_container"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
android:id="@+id/activity_menu"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context="com.dicoding.www.myactionbar.MenuActivity">
tools:context="com.dicoding.picodiploma.myactionbar.MenuActivity">

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:text="@string/ini_adalah_menu_activity" />
android:text="@string/this_activity" />
</RelativeLayout>
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context="com.dicoding.www.myactionbar.MenuFragment">
tools:context="com.dicoding.picodiploma.myactionbar.MenuFragment">

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:text="@string/ini_adalah_menu_fragment" />
android:text="@string/this_fragment" />

</RelativeLayout>
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
app:actionViewClass="android.widget.SearchView" />
<group android:menuCategory="container">
<item android:id="@+id/menu1"
android:title="@string/menu1"
android:title="@string/menu_1"
android:icon = "@drawable/ic_announcement_white_24px"
app:showAsAction="always" />
<item android:id="@+id/menu2"
Expand Down
7 changes: 3 additions & 4 deletions 04.Navigation/MyActionBar/app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
<resources>
<string name="app_name">MyActionBar</string>


<string name="hello_blank_fragment">Hello blank fragment</string>
<string name="search_hint">Masukkan kata</string>
<string name="ini_adalah_menu_activity">Ini adalah menu activity</string>
<string name="ini_adalah_menu_fragment">Ini adalah menu fragment</string>
<string name="this_activity">Ini adalah menu activity</string>
<string name="this_fragment">Ini adalah menu fragment</string>
<string name="search">Search</string>
<string name="menu1">Menu1</string>
<string name="menu_1">Menu 1</string>
<string name="menu_2">Menu 2</string>
</resources>
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.dicoding.www.myactionbar;
package com.dicoding.picodiploma.myactionbar;

import org.junit.Test;

Expand Down
12 changes: 3 additions & 9 deletions 04.Navigation/MyActionBar/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,11 @@

buildscript {
repositories {
google()
jcenter()
maven {
url 'https://maven.google.com/'
name 'Google'
}
}
dependencies {
classpath 'com.android.tools.build:gradle:3.1.3'
classpath 'com.android.tools.build:gradle:3.2.1'

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
Expand All @@ -18,11 +15,8 @@ buildscript {

allprojects {
repositories {
google()
jcenter()
maven {
url 'https://maven.google.com/'
name 'Google'
}
}
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Fri Jul 20 14:19:36 ICT 2018
#Fri Oct 19 13:15:13 ICT 2018
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip

0 comments on commit 371a9eb

Please sign in to comment.